docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity

alpine fixes: list is OK now, ncures for tput requirement

This commit is contained in:
diginc 2017-12-08 00:04:01 -06:00
parent 7c6c48e133
commit d47442ee6e
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.py
View File

@ -99,7 +99,7 @@ def generate_dockerfiles(args):
def build_dockerfiles(args):
if args['--no-build']:
print " ::: Skipping Dockerfile generation"
print " ::: Skipping Dockerfile building"
return
for os in args['--os']:

7
Dockerfile.template
View File

@ -15,9 +15,9 @@ ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/dow
{% if pihole.os == 'alpine' %}
# TODO Re-enable upgrade after php5 packages use the latest greatest libressl packages, conflicts are breaking build 2017-11-14
# RUN apk upgrade --update && \
RUN apk update && \
apk add bind-tools wget curl bash libcap && \
#RUN apk update && \
RUN apk upgrade --update && \
apk add bind-tools wget curl bash libcap ncurses && \
{% else %}
RUN apt-get update && \
apt-get install -y wget curl net-tools cron && \
@ -54,7 +54,6 @@ RUN mkdir -p /etc/pihole/ && \
chown dnsmasq:root /var/log/pihole.log && \
sed -i "s/@INT@/eth0/" /etc/dnsmasq.d/01-pihole.conf && \
setcap CAP_NET_BIND_SERVICE=+eip `which dnsmasq` && \
cp -f /usr/bin/list.sh /opt/pihole/list.sh && \
echo 'Done!'
{% endif %}

7
Dockerfile_alpine_amd64
View File

@ -14,9 +14,9 @@ ENV PIHOLE_INSTALL /tmp/ph_install.sh
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.2.1/s6-overlay-amd64.tar.gz
# TODO Re-enable upgrade after php5 packages use the latest greatest libressl packages, conflicts are breaking build 2017-11-14
# RUN apk upgrade --update && \
RUN apk update && \
apk add bind-tools wget curl bash libcap && \
#RUN apk update && \
RUN apk upgrade --update && \
apk add bind-tools wget curl bash libcap ncurses && \
curl -L -s $S6OVERLAY_RELEASE \
| tar xvzf - -C / && \
docker-install.sh && \
@ -44,7 +44,6 @@ RUN mkdir -p /etc/pihole/ && \
chown dnsmasq:root /var/log/pihole.log && \
sed -i "s/@INT@/eth0/" /etc/dnsmasq.d/01-pihole.conf && \
setcap CAP_NET_BIND_SERVICE=+eip `which dnsmasq` && \
cp -f /usr/bin/list.sh /opt/pihole/list.sh && \
echo 'Done!'
# php config start passes special ENVs into

1
Dockerfile_alpine_armhf
View File

@ -44,7 +44,6 @@ RUN mkdir -p /etc/pihole/ && \
chown dnsmasq:root /var/log/pihole.log && \
sed -i "s/@INT@/eth0/" /etc/dnsmasq.d/01-pihole.conf && \
setcap CAP_NET_BIND_SERVICE=+eip `which dnsmasq` && \
cp -f /usr/bin/list.sh /opt/pihole/list.sh && \
echo 'Done!'
# php config start passes special ENVs into