From db443aa0dc030e9a5ae3e07bf5a335c306ce02f4 Mon Sep 17 00:00:00 2001 From: diginc Date: Sun, 1 Oct 2017 23:33:15 -0500 Subject: [PATCH] alpine template variables swapped in --- Dockerfile_debian.template | 2 +- Dockerfile_debian_aarch64 | 2 +- Dockerfile_debian_amd64 | 2 +- Dockerfile_debian_armhf | 2 +- alpine-arm.docker | 3 ++- alpine-arm64.docker | 3 ++- alpine.docker | 3 ++- debian-armhf.docker | 14 +++++--------- debian.docker | 3 ++- requirements.txt | 1 + 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Dockerfile_debian.template b/Dockerfile_debian.template index 43947ec..1a003bc 100644 --- a/Dockerfile_debian.template +++ b/Dockerfile_debian.template @@ -1,5 +1,5 @@ FROM {{ image.base }} -LABEL {{ image.maintainer }} +LABEL maintainer="{{ image.maintainer }}" ENV IMAGE {{ os }} ENV ARCH {{ image.arch }} diff --git a/Dockerfile_debian_aarch64 b/Dockerfile_debian_aarch64 index df1100f..32b136e 100644 --- a/Dockerfile_debian_aarch64 +++ b/Dockerfile_debian_aarch64 @@ -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 diff --git a/Dockerfile_debian_amd64 b/Dockerfile_debian_amd64 index 9cc26e5..103cc2e 100644 --- a/Dockerfile_debian_amd64 +++ b/Dockerfile_debian_amd64 @@ -1,5 +1,5 @@ FROM debian:jessie -LABEL adam@diginc.us +LABEL maintainer="adam@diginc.us" ENV IMAGE debian ENV ARCH amd64 diff --git a/Dockerfile_debian_armhf b/Dockerfile_debian_armhf index 8848f5e..8e298af 100644 --- a/Dockerfile_debian_armhf +++ b/Dockerfile_debian_armhf @@ -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 diff --git a/alpine-arm.docker b/alpine-arm.docker index 0d05255..f15cf80 100644 --- a/alpine-arm.docker +++ b/alpine-arm.docker @@ -2,12 +2,13 @@ FROM multiarch/alpine:armhf-edge MAINTAINER 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 && \ diff --git a/alpine-arm64.docker b/alpine-arm64.docker index 34db0af..30a93c4 100644 --- a/alpine-arm64.docker +++ b/alpine-arm64.docker @@ -2,12 +2,13 @@ FROM multiarch/alpine:aarch64-edge MAINTAINER 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 && \ diff --git a/alpine.docker b/alpine.docker index 6ea64d9..7989a10 100644 --- a/alpine.docker +++ b/alpine.docker @@ -2,12 +2,13 @@ FROM alpine:edge MAINTAINER 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 && \ diff --git a/debian-armhf.docker b/debian-armhf.docker index 5ce57ca..a4b6ec5 100644 --- a/debian-armhf.docker +++ b/debian-armhf.docker @@ -1,21 +1,19 @@ -FROM jsurf/rpi-raspbian -MAINTAINER 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" ] diff --git a/debian.docker b/debian.docker index fe9c060..89b32c2 100644 --- a/debian.docker +++ b/debian.docker @@ -2,12 +2,13 @@ FROM debian:jessie MAINTAINER 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 && \ diff --git a/requirements.txt b/requirements.txt index 00e7363..04a28a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ pytest pytest-cov pytest-xdist testinfra==1.5.1 +jinja2