Release/v4.0

.travis.yml

@@ -7,7 +7,6 @@ env:
  - QEMU_VER=v2.9.1
  matrix:
  - ARCH=amd64
- - ARCH=armel
  - ARCH=armhf
  - ARCH=aarch64
 python:
@@ -21,4 +20,5 @@ script:
  - ./Dockerfile.py --arch=${ARCH} -v
  - docker images
  # run docker build & tests
- - py.test -vv -n auto -k "${ARCH}" ./test/
+ # 2 parallel max b/c race condition with docker fixture (I think?)
+ - py.test -vv -n 2 -k "${ARCH}" ./test/

Dockerfile.py

@@ -25,20 +25,18 @@
 THIS_DIR = os.path.dirname(os.path.abspath(__file__))
 
 base_vars = {
- 'name': 'diginc/pi-hole',
+ 'name': 'pihole/pihole',
  'maintainer' : 'adam@diginc.us',
  's6_version' : 'v1.21.4.0',
 }
 
 os_base_vars = {
- 'debian': {
- 'php_env_config': '/etc/lighttpd/conf-enabled/15-fastcgi-php.conf',
- 'php_error_log': '/var/log/lighttpd/error.log'
- },
+ 'php_env_config': '/etc/lighttpd/conf-enabled/15-fastcgi-php.conf',
+ 'php_error_log': '/var/log/lighttpd/error.log'
 }
 
 images = {
- 'debian': [
+ 'v4.0': [
  {
  'base': 'debian:stretch',
  'arch': 'amd64'
@@ -63,25 +61,25 @@ def generate_dockerfiles(args):
  print " ::: Skipping Dockerfile generation"
  return
 
- for os, archs in images.iteritems():
+ for version, archs in images.iteritems():
  for image in archs:
  if image['arch'] not in args['--arch'] or image['arch'] in args['--skip']:
  return
  s6arch = image['arch']
  if image['arch'] == 'armel':
  s6arch = 'arm'
  merged_data = dict(
- { 'os': os }.items() +
+ { 'version': version }.items() +
  base_vars.items() +
- os_base_vars[os].items() +
+ os_base_vars.items() +
  image.items() +
  { 's6arch': s6arch }.items()
  )
  j2_env = Environment(loader=FileSystemLoader(THIS_DIR),
  trim_blocks=True)
  template = j2_env.get_template('Dockerfile.template')
 
- dockerfile = 'Dockerfile_{}_{}'.format(os, image['arch'])
+ dockerfile = 'Dockerfile_{}'.format(image['arch'])
  with open(dockerfile, 'w') as f:
  f.write(template.render(pihole=merged_data))
 
@@ -92,21 +90,18 @@ def build_dockerfiles(args):
  return
 
  for arch in args['--arch']:
- docker_repo = 'pi-hole-multiarch'
- if arch == 'amd64':
- docker_repo = 'pi-hole'
+ # TODO: include from external .py that can be shared with Dockerfile.py / Tests / deploy scripts '''
+ build('pihole', 'v4.0', arch, args)
 
- build(docker_repo, 'debian', arch, args)
 
-
-def build(docker_repo, os, arch, args):
+def build(docker_repo, version, arch, args):
  run_local = testinfra.get_backend(
  "local://"
  ).get_module("Command").run
 
- dockerfile = 'Dockerfile_{}_{}'.format(os, arch)
- repo_tag = '{}:{}_{}'.format(docker_repo, os, arch)
- cached_image = '{}/{}'.format('diginc', repo_tag)
+ dockerfile = 'Dockerfile_{}'.format(arch)
+ repo_tag = '{}:{}_{}'.format(docker_repo, version, arch)
+ cached_image = '{}/{}'.format('pihole', repo_tag)
  no_cache = ''
  if args['--no-cache']:
  no_cache = '--no-cache'
@@ -118,14 +113,15 @@ def build(docker_repo, os, arch, args):
  build_result = run_local(build_command) 
  if args['-v']:
  print build_result.stdout
+ print build_result.stderr
  if build_result.rc != 0:
  print " ::: Building {} encountered an error".format(dockerfile)
  print build_result.stderr
  assert build_result.rc == 0
 
 
 if __name__ == '__main__':
- args = docopt(__doc__, version='Dockerfile 0.2')
+ args = docopt(__doc__, version='Dockerfile 1.0')
  # print args
 
  generate_dockerfiles(args)

Dockerfile.template

@@ -1,29 +1,20 @@
 FROM {{ pihole.base }}
 
-LABEL image="{{ pihole.name }}:{{ pihole.os }}_{{ pihole.arch }}"
-LABEL maintainer="{{ pihole.maintainer }}"
-LABEL url="https://www.github.com/diginc/docker-pi-hole"
-
-ENV TAG {{ pihole.os }}
-ENV ARCH {{ pihole.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 PIHOLE_INSTALL /root/ph_install.sh
 ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/{{ pihole.s6_version }}/s6-overlay-{{ pihole.s6arch }}.tar.gz
 
 RUN apt-get update && \
- apt-get install -y wget curl net-tools cron procps && \
- curl -L -s $S6OVERLAY_RELEASE \
- | tar xvzf - -C / && \
- docker-install.sh && \
+ apt-get install -y curl procps && \
+ curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C / && \
  rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
  mv /init /s6-init
 
+RUN apt-get update && bash -ex docker-install.sh 2>&1
+
 ENTRYPOINT [ "/s6-init" ]
 
-ADD s6/{{ pihole.os }}-root /
+ADD s6/debian-root /
 COPY s6/service /usr/local/bin/service
 
 # php config start passes special ENVs into
@@ -45,6 +36,14 @@ ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
 ENV FTL_CMD no-daemon
 
+ENV VERSION {{ pihole.version }}
+ENV ARCH {{ pihole.arch }}
+ENV PATH /opt/pihole:${PATH}
+
+LABEL image="{{ pihole.name }}:{{ pihole.version }}_{{ pihole.arch }}"
+LABEL maintainer="{{ pihole.maintainer }}"
+LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
+
 HEALTHCHECK CMD dig @127.0.0.1 pi.hole || exit 1
 
 SHELL ["/bin/bash", "-c"]

Dockerfile_debian_aarch64 → Dockerfile_aarch64

@@ -1,26 +1,17 @@
 FROM multiarch/debian-debootstrap:arm64-stretch-slim
 
-LABEL image="diginc/pi-hole:debian_aarch64"
-LABEL maintainer="adam@diginc.us"
-LABEL url="https://www.github.com/diginc/docker-pi-hole"
-
-ENV TAG debian
-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 PIHOLE_INSTALL /root/ph_install.sh
 ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-aarch64.tar.gz
 
 RUN apt-get update && \
- apt-get install -y wget curl net-tools cron procps && \
- curl -L -s $S6OVERLAY_RELEASE \
- | tar xvzf - -C / && \
- docker-install.sh && \
+ apt-get install -y curl procps && \
+ curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C / && \
  rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
  mv /init /s6-init
 
+RUN apt-get update && bash -ex docker-install.sh 2>&1
+
 ENTRYPOINT [ "/s6-init" ]
 
 ADD s6/debian-root /
@@ -45,6 +36,14 @@ ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
 ENV FTL_CMD no-daemon
 
+ENV VERSION v4.0
+ENV ARCH aarch64
+ENV PATH /opt/pihole:${PATH}
+
+LABEL image="pihole/pihole:v4.0_aarch64"
+LABEL maintainer="adam@diginc.us"
+LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
+
 HEALTHCHECK CMD dig @127.0.0.1 pi.hole || exit 1
 
 SHELL ["/bin/bash", "-c"]

Dockerfile_debian_amd64 → Dockerfile_amd64

@@ -1,26 +1,17 @@
 FROM debian:stretch
 
-LABEL image="diginc/pi-hole:debian_amd64"
-LABEL maintainer="adam@diginc.us"
-LABEL url="https://www.github.com/diginc/docker-pi-hole"
-
-ENV TAG 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 PIHOLE_INSTALL /root/ph_install.sh
 ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
 
 RUN apt-get update && \
- apt-get install -y wget curl net-tools cron procps && \
- curl -L -s $S6OVERLAY_RELEASE \
- | tar xvzf - -C / && \
- docker-install.sh && \
+ apt-get install -y curl procps && \
+ curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C / && \
  rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
  mv /init /s6-init
 
+RUN apt-get update && bash -ex docker-install.sh 2>&1
+
 ENTRYPOINT [ "/s6-init" ]
 
 ADD s6/debian-root /
@@ -45,6 +36,14 @@ ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
 ENV FTL_CMD no-daemon
 
+ENV VERSION v4.0
+ENV ARCH amd64
+ENV PATH /opt/pihole:${PATH}
+
+LABEL image="pihole/pihole:v4.0_amd64"
+LABEL maintainer="adam@diginc.us"
+LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
+
 HEALTHCHECK CMD dig @127.0.0.1 pi.hole || exit 1
 
 SHELL ["/bin/bash", "-c"]

Dockerfile_debian_armel → Dockerfile_armel

@@ -1,26 +1,17 @@
 FROM multiarch/debian-debootstrap:armel-stretch-slim
 
-LABEL image="diginc/pi-hole:debian_armel"
-LABEL maintainer="adam@diginc.us"
-LABEL url="https://www.github.com/diginc/docker-pi-hole"
-
-ENV TAG debian
-ENV ARCH armel
-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 PIHOLE_INSTALL /root/ph_install.sh
 ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-arm.tar.gz
 
 RUN apt-get update && \
- apt-get install -y wget curl net-tools cron procps && \
- curl -L -s $S6OVERLAY_RELEASE \
- | tar xvzf - -C / && \
- docker-install.sh && \
+ apt-get install -y curl procps && \
+ curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C / && \
  rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
  mv /init /s6-init
 
+RUN apt-get update && bash -ex docker-install.sh 2>&1
+
 ENTRYPOINT [ "/s6-init" ]
 
 ADD s6/debian-root /
@@ -45,6 +36,14 @@ ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
 ENV FTL_CMD no-daemon
 
+ENV VERSION v4.0
+ENV ARCH armel
+ENV PATH /opt/pihole:${PATH}
+
+LABEL image="pihole/pihole:v4.0_armel"
+LABEL maintainer="adam@diginc.us"
+LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
+
 HEALTHCHECK CMD dig @127.0.0.1 pi.hole || exit 1
 
 SHELL ["/bin/bash", "-c"]

Dockerfile_debian_armhf → Dockerfile_armhf

@@ -1,26 +1,17 @@
 FROM multiarch/debian-debootstrap:armhf-stretch-slim
 
-LABEL image="diginc/pi-hole:debian_armhf"
-LABEL maintainer="adam@diginc.us"
-LABEL url="https://www.github.com/diginc/docker-pi-hole"
-
-ENV TAG debian
-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 PIHOLE_INSTALL /root/ph_install.sh
 ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-armhf.tar.gz
 
 RUN apt-get update && \
- apt-get install -y wget curl net-tools cron procps && \
- curl -L -s $S6OVERLAY_RELEASE \
- | tar xvzf - -C / && \
- docker-install.sh && \
+ apt-get install -y curl procps && \
+ curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C / && \
  rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
  mv /init /s6-init
 
+RUN apt-get update && bash -ex docker-install.sh 2>&1
+
 ENTRYPOINT [ "/s6-init" ]
 
 ADD s6/debian-root /
@@ -45,6 +36,14 @@ ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
 ENV FTL_CMD no-daemon
 
+ENV VERSION v4.0
+ENV ARCH armhf
+ENV PATH /opt/pihole:${PATH}
+
+LABEL image="pihole/pihole:v4.0_armhf"
+LABEL maintainer="adam@diginc.us"
+LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
+
 HEALTHCHECK CMD dig @127.0.0.1 pi.hole || exit 1
 
 SHELL ["/bin/bash", "-c"]