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

updates from PR comments

This commit is contained in:
diginc 2018-01-26 21:10:56 -06:00
parent e430d5a5e5
commit 91a483614b
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.template
View File

@ -4,7 +4,6 @@ LABEL image="{{ pihole.name }}:{{ pihole.os }}_{{ pihole.arch }}"
LABEL maintainer="{{ pihole.maintainer }}" LABEL maintainer="{{ pihole.maintainer }}"
LABEL url="https://www.github.com/diginc/docker-pi-hole" LABEL url="https://www.github.com/diginc/docker-pi-hole"
ARG DEBIAN_FRONTED=noninteractive
ENV TAG {{ pihole.os }} ENV TAG {{ pihole.os }}
ENV ARCH {{ pihole.arch }} ENV ARCH {{ pihole.arch }}
ENV PATH /opt/pihole:${PATH} ENV PATH /opt/pihole:${PATH}
@ -19,7 +18,7 @@ RUN apt-get update && \
curl -L -s $S6OVERLAY_RELEASE \ curl -L -s $S6OVERLAY_RELEASE \
| tar xvzf - -C / && \ | tar xvzf - -C / && \
docker-install.sh && \ docker-install.sh && \
rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
mv /init /s6-init mv /init /s6-init
ENTRYPOINT [ "/s6-init" ] ENTRYPOINT [ "/s6-init" ]

6
Dockerfile_debian_aarch64
View File

@ -4,7 +4,6 @@ LABEL image="diginc/pi-hole:debian_aarch64"
LABEL maintainer="adam@diginc.us" LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/diginc/docker-pi-hole" LABEL url="https://www.github.com/diginc/docker-pi-hole"
ARG DEBIAN_FRONTED=noninteractive
ENV TAG debian ENV TAG debian
ENV ARCH aarch64 ENV ARCH aarch64
ENV PATH /opt/pihole:${PATH} ENV PATH /opt/pihole:${PATH}
@ -19,9 +18,10 @@ RUN apt-get update && \
curl -L -s $S6OVERLAY_RELEASE \ curl -L -s $S6OVERLAY_RELEASE \
| tar xvzf - -C / && \ | tar xvzf - -C / && \
docker-install.sh && \ docker-install.sh && \
rm -rf /var/cache/apt/archives /var/lib/apt/lists/* rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
mv /init /s6-init
ENTRYPOINT [ "/init" ] ENTRYPOINT [ "/s6-init" ]
ADD s6/debian-root / ADD s6/debian-root /
COPY s6/service /usr/local/bin/service COPY s6/service /usr/local/bin/service

6
Dockerfile_debian_amd64
View File

@ -4,7 +4,6 @@ LABEL image="diginc/pi-hole:debian_amd64"
LABEL maintainer="adam@diginc.us" LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/diginc/docker-pi-hole" LABEL url="https://www.github.com/diginc/docker-pi-hole"
ARG DEBIAN_FRONTED=noninteractive
ENV TAG debian ENV TAG debian
ENV ARCH amd64 ENV ARCH amd64
ENV PATH /opt/pihole:${PATH} ENV PATH /opt/pihole:${PATH}
@ -19,9 +18,10 @@ RUN apt-get update && \
curl -L -s $S6OVERLAY_RELEASE \ curl -L -s $S6OVERLAY_RELEASE \
| tar xvzf - -C / && \ | tar xvzf - -C / && \
docker-install.sh && \ docker-install.sh && \
rm -rf /var/cache/apt/archives /var/lib/apt/lists/* rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
mv /init /s6-init
ENTRYPOINT [ "/init" ] ENTRYPOINT [ "/s6-init" ]
ADD s6/debian-root / ADD s6/debian-root /
COPY s6/service /usr/local/bin/service COPY s6/service /usr/local/bin/service

6
Dockerfile_debian_armhf
View File

@ -4,7 +4,6 @@ LABEL image="diginc/pi-hole:debian_armhf"
LABEL maintainer="adam@diginc.us" LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/diginc/docker-pi-hole" LABEL url="https://www.github.com/diginc/docker-pi-hole"
ARG DEBIAN_FRONTED=noninteractive
ENV TAG debian ENV TAG debian
ENV ARCH armhf ENV ARCH armhf
ENV PATH /opt/pihole:${PATH} ENV PATH /opt/pihole:${PATH}
@ -19,9 +18,10 @@ RUN apt-get update && \
curl -L -s $S6OVERLAY_RELEASE \ curl -L -s $S6OVERLAY_RELEASE \
| tar xvzf - -C / && \ | tar xvzf - -C / && \
docker-install.sh && \ docker-install.sh && \
rm -rf /var/cache/apt/archives /var/lib/apt/lists/* rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
mv /init /s6-init
ENTRYPOINT [ "/init" ] ENTRYPOINT [ "/s6-init" ]
ADD s6/debian-root / ADD s6/debian-root /
COPY s6/service /usr/local/bin/service COPY s6/service /usr/local/bin/service

2
install.sh
View File

@ -10,7 +10,7 @@ export USE_DEVELOPMENT_BRANCHES=true
# For more info see docker/docker issue #7459 # For more info see docker/docker issue #7459
which systemctl && mv "$(which systemctl)" /bin/no_systemctl which systemctl && mv "$(which systemctl)" /bin/no_systemctl
# debconf-apt-progress seems to hang so get rid of it too # debconf-apt-progress seems to hang so get rid of it too
which which debconf-apt-progress && mv "$(which debconf-apt-progress)" /bin/no_debconf-apt-progress which debconf-apt-progress && mv "$(which debconf-apt-progress)" /bin/no_debconf-apt-progress
# Get the install functions # Get the install functions
CUSTOM_INSTALL='development' CUSTOM_INSTALL='development'