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 template variables swapped in

This commit is contained in:
diginc 2017-10-01 23:33:15 -05:00
parent ba86bc53d8
commit db443aa0dc
10 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile_debian.template
View File

@ -1,5 +1,5 @@
FROM {{ image.base }}
LABEL {{ image.maintainer }}
LABEL maintainer="{{ image.maintainer }}"
ENV IMAGE {{ os }}
ENV ARCH {{ image.arch }}

2
Dockerfile_debian_aarch64
View File

@ -1,5 +1,5 @@
FROM multiarch/debian-debootstrap:arm64-jessie-slim
LABEL adam@diginc.us
LABEL maintainer="adam@diginc.us"
ENV IMAGE debian
ENV ARCH aarch64

2
Dockerfile_debian_amd64
View File

@ -1,5 +1,5 @@
FROM debian:jessie
LABEL adam@diginc.us
LABEL maintainer="adam@diginc.us"
ENV IMAGE debian
ENV ARCH amd64

2
Dockerfile_debian_armhf
View File

@ -1,5 +1,5 @@
FROM multiarch/debian-debootstrap:armhf-jessie-slim
LABEL adam@diginc.us
LABEL maintainer="adam@diginc.us"
ENV IMAGE debian
ENV ARCH armhf

3
alpine-arm.docker
View File

@ -2,12 +2,13 @@ FROM multiarch/alpine:armhf-edge
MAINTAINER adam@diginc.us <adam@diginc.us>
ENV IMAGE alpine
ENV ARCH armhf
ENV PATH /opt/pihole:${PATH}
COPY install.sh /usr/local/bin/docker-install.sh
ENV setupVars /etc/pihole/setupVars.conf
ENV PIHOLE_INSTALL /tmp/ph_install.sh
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.19.1.1/s6-overlay-armhf.tar.gz
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.20.0.0/s6-overlay-armhf.tar.gz
RUN apk upgrade --update && \
apk add bind-tools wget curl bash libcap && \

3
alpine-arm64.docker
View File

@ -2,12 +2,13 @@ FROM multiarch/alpine:aarch64-edge
MAINTAINER adam@diginc.us <adam@diginc.us>
ENV IMAGE alpine
ENV ARCH aarch64
ENV PATH /opt/pihole:${PATH}
COPY install.sh /usr/local/bin/docker-install.sh
ENV setupVars /etc/pihole/setupVars.conf
ENV PIHOLE_INSTALL /tmp/ph_install.sh
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.19.1.1/s6-overlay-aarch64.tar.gz
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.20.0.0/s6-overlay-aarch64.tar.gz
RUN apk upgrade --update && \
apk add bind-tools wget curl bash libcap && \

3
alpine.docker
View File

@ -2,12 +2,13 @@ FROM alpine:edge
MAINTAINER adam@diginc.us <adam@diginc.us>
ENV IMAGE alpine
ENV ARCH amd64
ENV PATH /opt/pihole:${PATH}
COPY install.sh /usr/local/bin/docker-install.sh
ENV setupVars /etc/pihole/setupVars.conf
ENV PIHOLE_INSTALL /tmp/ph_install.sh
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.19.1.1/s6-overlay-amd64.tar.gz
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.20.0.0/s6-overlay-amd64.tar.gz
RUN apk upgrade --update && \
apk add bind-tools wget curl bash libcap && \

14
debian-armhf.docker
View File

@ -1,21 +1,19 @@
FROM jsurf/rpi-raspbian
MAINTAINER adam@diginc.us <adam@diginc.us>
FROM {{ image.base }}
LABEL maintainer="{{ image.maintainer }}"
RUN [ "cross-build-start" ]
ENV IMAGE debian
ENV IMAGE {{ os }}
ENV ARCH {{ image.arch }}
ENV PATH /opt/pihole:${PATH}
COPY install.sh /usr/local/bin/docker-install.sh
ENV setupVars /etc/pihole/setupVars.conf
ENV PIHOLE_INSTALL /tmp/ph_install.sh
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.19.1.1/s6-overlay-armhf.tar.gz
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.20.0.0/s6-overlay-armhf.tar.gz
RUN apt-get update && \
apt-get install -y wget curl net-tools cron && \
curl -L -s $S6OVERLAY_RELEASE \
| tar xvzf - -C / && \
ln /lib/ld-linux-armhf.so.3 /lib/ld-linux.so.3 && \
docker-install.sh && \
rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
@ -42,5 +40,3 @@ ENV S6_KEEP_ENV 1
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
SHELL ["/bin/bash", "-c"]
RUN [ "cross-build-end" ]

3
debian.docker
View File

@ -2,12 +2,13 @@ FROM debian:jessie
MAINTAINER adam@diginc.us <adam@diginc.us>
ENV IMAGE debian
ENV ARCH amd64
ENV PATH /opt/pihole:${PATH}
COPY install.sh /usr/local/bin/docker-install.sh
ENV setupVars /etc/pihole/setupVars.conf
ENV PIHOLE_INSTALL /tmp/ph_install.sh
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.19.1.1/s6-overlay-amd64.tar.gz
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.20.0.0/s6-overlay-amd64.tar.gz
RUN apt-get update && \
apt-get install -y wget curl net-tools cron && \

1
requirements.txt
View File

@ -3,3 +3,4 @@ pytest
pytest-cov
pytest-xdist
testinfra==1.5.1
jinja2