From 0bb4068bd639ba98631bc2999e0d20cae583ec00 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 11 Oct 2017 14:20:04 -0700 Subject: [PATCH 1/4] Restructure organization so to support simultaneous base distro releases - this will allow us release to `jessie` and `stretch` variants at the same time so that users have a time to transition from one to the other. --- .travis.yml | 64 +++++------ 5.6/{alpine => alpine3.4/cli}/Dockerfile | 0 .../cli}/docker-php-entrypoint | 0 .../cli}/docker-php-ext-configure | 0 .../cli}/docker-php-ext-enable | 0 .../cli}/docker-php-ext-install | 0 .../cli}/docker-php-source | 0 5.6/{fpm/alpine => alpine3.4/fpm}/Dockerfile | 0 .../fpm}/docker-php-entrypoint | 0 .../fpm}/docker-php-ext-configure | 0 .../fpm}/docker-php-ext-enable | 0 .../fpm}/docker-php-ext-install | 0 .../fpm}/docker-php-source | 0 5.6/{zts/alpine => alpine3.4/zts}/Dockerfile | 0 5.6/{ => alpine3.4/zts}/docker-php-entrypoint | 0 .../zts}/docker-php-ext-configure | 0 5.6/{ => alpine3.4/zts}/docker-php-ext-enable | 0 .../zts}/docker-php-ext-install | 0 5.6/{ => alpine3.4/zts}/docker-php-source | 0 5.6/{ => jessie}/apache/Dockerfile | 0 5.6/{ => jessie}/apache/apache2-foreground | 0 5.6/{ => jessie}/apache/docker-php-entrypoint | 0 .../apache}/docker-php-ext-configure | 0 .../apache}/docker-php-ext-enable | 0 .../apache}/docker-php-ext-install | 0 .../apache}/docker-php-source | 0 5.6/{ => jessie/cli}/Dockerfile | 0 .../cli}/docker-php-entrypoint | 0 .../cli}/docker-php-ext-configure | 0 5.6/{fpm => jessie/cli}/docker-php-ext-enable | 0 .../cli}/docker-php-ext-install | 0 5.6/{fpm => jessie/cli}/docker-php-source | 0 5.6/{ => jessie}/fpm/Dockerfile | 0 5.6/{ => jessie}/fpm/docker-php-entrypoint | 0 .../fpm}/docker-php-ext-configure | 0 .../fpm}/docker-php-ext-enable | 0 .../fpm}/docker-php-ext-install | 0 .../alpine => jessie/fpm}/docker-php-source | 0 5.6/{ => jessie}/zts/Dockerfile | 0 5.6/{ => jessie}/zts/docker-php-entrypoint | 0 5.6/{ => jessie}/zts/docker-php-ext-configure | 0 5.6/{ => jessie}/zts/docker-php-ext-enable | 0 5.6/{ => jessie}/zts/docker-php-ext-install | 0 5.6/{ => jessie}/zts/docker-php-source | 0 7.0/{alpine => alpine3.4/cli}/Dockerfile | 0 .../cli}/docker-php-entrypoint | 0 .../cli}/docker-php-ext-configure | 0 .../cli}/docker-php-ext-enable | 0 .../cli}/docker-php-ext-install | 0 .../cli}/docker-php-source | 0 7.0/{fpm/alpine => alpine3.4/fpm}/Dockerfile | 0 .../fpm}/docker-php-entrypoint | 0 .../fpm}/docker-php-ext-configure | 0 .../fpm}/docker-php-ext-enable | 0 .../fpm}/docker-php-ext-install | 0 .../fpm}/docker-php-source | 0 7.0/{zts/alpine => alpine3.4/zts}/Dockerfile | 0 7.0/{ => alpine3.4/zts}/docker-php-entrypoint | 0 .../zts}/docker-php-ext-configure | 0 7.0/{ => alpine3.4/zts}/docker-php-ext-enable | 0 .../zts}/docker-php-ext-install | 0 7.0/{ => alpine3.4/zts}/docker-php-source | 0 7.0/{ => jessie}/apache/Dockerfile | 0 7.0/{ => jessie}/apache/apache2-foreground | 0 7.0/{ => jessie}/apache/docker-php-entrypoint | 0 .../apache}/docker-php-ext-configure | 0 .../apache}/docker-php-ext-enable | 0 .../apache}/docker-php-ext-install | 0 .../apache}/docker-php-source | 0 7.0/{ => jessie/cli}/Dockerfile | 0 .../cli}/docker-php-entrypoint | 0 .../cli}/docker-php-ext-configure | 0 7.0/{fpm => jessie/cli}/docker-php-ext-enable | 0 .../cli}/docker-php-ext-install | 0 7.0/{fpm => jessie/cli}/docker-php-source | 0 7.0/{ => jessie}/fpm/Dockerfile | 0 7.0/{ => jessie}/fpm/docker-php-entrypoint | 0 .../fpm}/docker-php-ext-configure | 0 .../fpm}/docker-php-ext-enable | 0 .../fpm}/docker-php-ext-install | 0 .../alpine => jessie/fpm}/docker-php-source | 0 7.0/{ => jessie}/zts/Dockerfile | 0 7.0/{ => jessie}/zts/docker-php-entrypoint | 0 7.0/{ => jessie}/zts/docker-php-ext-configure | 0 7.0/{ => jessie}/zts/docker-php-ext-enable | 0 7.0/{ => jessie}/zts/docker-php-ext-install | 0 7.0/{ => jessie}/zts/docker-php-source | 0 7.1/{alpine => alpine3.4/cli}/Dockerfile | 0 .../cli}/docker-php-entrypoint | 0 .../cli}/docker-php-ext-configure | 0 .../cli}/docker-php-ext-enable | 0 .../cli}/docker-php-ext-install | 0 .../cli}/docker-php-source | 0 7.1/{fpm/alpine => alpine3.4/fpm}/Dockerfile | 0 .../fpm}/docker-php-entrypoint | 0 .../fpm}/docker-php-ext-configure | 0 .../fpm}/docker-php-ext-enable | 0 .../fpm}/docker-php-ext-install | 0 .../fpm}/docker-php-source | 0 7.1/{zts/alpine => alpine3.4/zts}/Dockerfile | 0 7.1/{ => alpine3.4/zts}/docker-php-entrypoint | 0 .../zts}/docker-php-ext-configure | 0 7.1/{ => alpine3.4/zts}/docker-php-ext-enable | 0 .../zts}/docker-php-ext-install | 0 7.1/{ => alpine3.4/zts}/docker-php-source | 0 7.1/{ => jessie}/apache/Dockerfile | 0 7.1/{ => jessie}/apache/apache2-foreground | 0 7.1/{ => jessie}/apache/docker-php-entrypoint | 0 .../apache}/docker-php-ext-configure | 0 .../apache}/docker-php-ext-enable | 0 .../apache}/docker-php-ext-install | 0 .../apache}/docker-php-source | 0 7.1/{ => jessie/cli}/Dockerfile | 0 .../cli}/docker-php-entrypoint | 0 .../cli}/docker-php-ext-configure | 0 7.1/{fpm => jessie/cli}/docker-php-ext-enable | 0 .../cli}/docker-php-ext-install | 0 7.1/{fpm => jessie/cli}/docker-php-source | 0 7.1/{ => jessie}/fpm/Dockerfile | 0 7.1/{ => jessie}/fpm/docker-php-entrypoint | 0 .../fpm}/docker-php-ext-configure | 0 .../fpm}/docker-php-ext-enable | 0 .../fpm}/docker-php-ext-install | 0 .../alpine => jessie/fpm}/docker-php-source | 0 7.1/{ => jessie}/zts/Dockerfile | 0 7.1/{ => jessie}/zts/docker-php-entrypoint | 0 7.1/{ => jessie}/zts/docker-php-ext-configure | 0 7.1/{ => jessie}/zts/docker-php-ext-enable | 0 7.1/{ => jessie}/zts/docker-php-ext-install | 0 7.1/{ => jessie}/zts/docker-php-source | 0 7.2-rc/{alpine => alpine3.6/cli}/Dockerfile | 0 .../cli}/docker-php-entrypoint | 0 .../cli}/docker-php-ext-configure | 0 .../cli}/docker-php-ext-enable | 0 .../cli}/docker-php-ext-install | 0 .../cli}/docker-php-source | 0 .../{fpm/alpine => alpine3.6/fpm}/Dockerfile | 0 .../fpm}/docker-php-entrypoint | 0 .../fpm}/docker-php-ext-configure | 0 .../fpm}/docker-php-ext-enable | 0 .../fpm}/docker-php-ext-install | 0 .../fpm}/docker-php-source | 0 .../{zts/alpine => alpine3.6/zts}/Dockerfile | 0 .../{ => alpine3.6/zts}/docker-php-entrypoint | 0 .../zts}/docker-php-ext-configure | 0 .../{ => alpine3.6/zts}/docker-php-ext-enable | 0 .../zts}/docker-php-ext-install | 0 7.2-rc/{ => alpine3.6/zts}/docker-php-source | 0 7.2-rc/{ => stretch-slim}/apache/Dockerfile | 0 .../apache/apache2-foreground | 0 .../apache/docker-php-entrypoint | 0 .../apache}/docker-php-ext-configure | 0 .../apache}/docker-php-ext-enable | 0 .../apache}/docker-php-ext-install | 0 .../apache}/docker-php-source | 0 7.2-rc/{ => stretch-slim/cli}/Dockerfile | 0 .../cli}/docker-php-entrypoint | 0 .../cli}/docker-php-ext-configure | 0 .../cli}/docker-php-ext-enable | 0 .../cli}/docker-php-ext-install | 0 .../cli}/docker-php-source | 0 7.2-rc/{ => stretch-slim}/fpm/Dockerfile | 0 .../fpm/docker-php-entrypoint | 0 .../fpm}/docker-php-ext-configure | 0 .../fpm}/docker-php-ext-enable | 0 .../fpm}/docker-php-ext-install | 0 .../fpm}/docker-php-source | 0 7.2-rc/{ => stretch-slim}/zts/Dockerfile | 0 .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../{ => stretch-slim}/zts/docker-php-source | 0 update.sh | 102 +++++++----------- 174 files changed, 69 insertions(+), 97 deletions(-) rename 5.6/{alpine => alpine3.4/cli}/Dockerfile (100%) rename 5.6/{alpine => alpine3.4/cli}/docker-php-entrypoint (100%) rename 5.6/{alpine => alpine3.4/cli}/docker-php-ext-configure (100%) rename 5.6/{alpine => alpine3.4/cli}/docker-php-ext-enable (100%) rename 5.6/{alpine => alpine3.4/cli}/docker-php-ext-install (100%) rename 5.6/{alpine => alpine3.4/cli}/docker-php-source (100%) rename 5.6/{fpm/alpine => alpine3.4/fpm}/Dockerfile (100%) rename 5.6/{fpm/alpine => alpine3.4/fpm}/docker-php-entrypoint (100%) rename 5.6/{apache => alpine3.4/fpm}/docker-php-ext-configure (100%) rename 5.6/{apache => alpine3.4/fpm}/docker-php-ext-enable (100%) rename 5.6/{apache => alpine3.4/fpm}/docker-php-ext-install (100%) rename 5.6/{apache => alpine3.4/fpm}/docker-php-source (100%) rename 5.6/{zts/alpine => alpine3.4/zts}/Dockerfile (100%) rename 5.6/{ => alpine3.4/zts}/docker-php-entrypoint (100%) rename 5.6/{ => alpine3.4/zts}/docker-php-ext-configure (100%) rename 5.6/{ => alpine3.4/zts}/docker-php-ext-enable (100%) rename 5.6/{ => alpine3.4/zts}/docker-php-ext-install (100%) rename 5.6/{ => alpine3.4/zts}/docker-php-source (100%) rename 5.6/{ => jessie}/apache/Dockerfile (100%) rename 5.6/{ => jessie}/apache/apache2-foreground (100%) rename 5.6/{ => jessie}/apache/docker-php-entrypoint (100%) rename 5.6/{fpm/alpine => jessie/apache}/docker-php-ext-configure (100%) rename 5.6/{fpm/alpine => jessie/apache}/docker-php-ext-enable (100%) rename 5.6/{fpm/alpine => jessie/apache}/docker-php-ext-install (100%) rename 5.6/{fpm/alpine => jessie/apache}/docker-php-source (100%) rename 5.6/{ => jessie/cli}/Dockerfile (100%) rename 5.6/{zts/alpine => jessie/cli}/docker-php-entrypoint (100%) rename 5.6/{fpm => jessie/cli}/docker-php-ext-configure (100%) rename 5.6/{fpm => jessie/cli}/docker-php-ext-enable (100%) rename 5.6/{fpm => jessie/cli}/docker-php-ext-install (100%) rename 5.6/{fpm => jessie/cli}/docker-php-source (100%) rename 5.6/{ => jessie}/fpm/Dockerfile (100%) rename 5.6/{ => jessie}/fpm/docker-php-entrypoint (100%) rename 5.6/{zts/alpine => jessie/fpm}/docker-php-ext-configure (100%) rename 5.6/{zts/alpine => jessie/fpm}/docker-php-ext-enable (100%) rename 5.6/{zts/alpine => jessie/fpm}/docker-php-ext-install (100%) rename 5.6/{zts/alpine => jessie/fpm}/docker-php-source (100%) rename 5.6/{ => jessie}/zts/Dockerfile (100%) rename 5.6/{ => jessie}/zts/docker-php-entrypoint (100%) rename 5.6/{ => jessie}/zts/docker-php-ext-configure (100%) rename 5.6/{ => jessie}/zts/docker-php-ext-enable (100%) rename 5.6/{ => jessie}/zts/docker-php-ext-install (100%) rename 5.6/{ => jessie}/zts/docker-php-source (100%) rename 7.0/{alpine => alpine3.4/cli}/Dockerfile (100%) rename 7.0/{alpine => alpine3.4/cli}/docker-php-entrypoint (100%) rename 7.0/{alpine => alpine3.4/cli}/docker-php-ext-configure (100%) rename 7.0/{alpine => alpine3.4/cli}/docker-php-ext-enable (100%) rename 7.0/{alpine => alpine3.4/cli}/docker-php-ext-install (100%) rename 7.0/{alpine => alpine3.4/cli}/docker-php-source (100%) rename 7.0/{fpm/alpine => alpine3.4/fpm}/Dockerfile (100%) rename 7.0/{fpm/alpine => alpine3.4/fpm}/docker-php-entrypoint (100%) rename 7.0/{apache => alpine3.4/fpm}/docker-php-ext-configure (100%) rename 7.0/{apache => alpine3.4/fpm}/docker-php-ext-enable (100%) rename 7.0/{apache => alpine3.4/fpm}/docker-php-ext-install (100%) rename 7.0/{apache => alpine3.4/fpm}/docker-php-source (100%) rename 7.0/{zts/alpine => alpine3.4/zts}/Dockerfile (100%) rename 7.0/{ => alpine3.4/zts}/docker-php-entrypoint (100%) rename 7.0/{ => alpine3.4/zts}/docker-php-ext-configure (100%) rename 7.0/{ => alpine3.4/zts}/docker-php-ext-enable (100%) rename 7.0/{ => alpine3.4/zts}/docker-php-ext-install (100%) rename 7.0/{ => alpine3.4/zts}/docker-php-source (100%) rename 7.0/{ => jessie}/apache/Dockerfile (100%) rename 7.0/{ => jessie}/apache/apache2-foreground (100%) rename 7.0/{ => jessie}/apache/docker-php-entrypoint (100%) rename 7.0/{fpm/alpine => jessie/apache}/docker-php-ext-configure (100%) rename 7.0/{fpm/alpine => jessie/apache}/docker-php-ext-enable (100%) rename 7.0/{fpm/alpine => jessie/apache}/docker-php-ext-install (100%) rename 7.0/{fpm/alpine => jessie/apache}/docker-php-source (100%) rename 7.0/{ => jessie/cli}/Dockerfile (100%) rename 7.0/{zts/alpine => jessie/cli}/docker-php-entrypoint (100%) rename 7.0/{fpm => jessie/cli}/docker-php-ext-configure (100%) rename 7.0/{fpm => jessie/cli}/docker-php-ext-enable (100%) rename 7.0/{fpm => jessie/cli}/docker-php-ext-install (100%) rename 7.0/{fpm => jessie/cli}/docker-php-source (100%) rename 7.0/{ => jessie}/fpm/Dockerfile (100%) rename 7.0/{ => jessie}/fpm/docker-php-entrypoint (100%) rename 7.0/{zts/alpine => jessie/fpm}/docker-php-ext-configure (100%) rename 7.0/{zts/alpine => jessie/fpm}/docker-php-ext-enable (100%) rename 7.0/{zts/alpine => jessie/fpm}/docker-php-ext-install (100%) rename 7.0/{zts/alpine => jessie/fpm}/docker-php-source (100%) rename 7.0/{ => jessie}/zts/Dockerfile (100%) rename 7.0/{ => jessie}/zts/docker-php-entrypoint (100%) rename 7.0/{ => jessie}/zts/docker-php-ext-configure (100%) rename 7.0/{ => jessie}/zts/docker-php-ext-enable (100%) rename 7.0/{ => jessie}/zts/docker-php-ext-install (100%) rename 7.0/{ => jessie}/zts/docker-php-source (100%) rename 7.1/{alpine => alpine3.4/cli}/Dockerfile (100%) rename 7.1/{alpine => alpine3.4/cli}/docker-php-entrypoint (100%) rename 7.1/{alpine => alpine3.4/cli}/docker-php-ext-configure (100%) rename 7.1/{alpine => alpine3.4/cli}/docker-php-ext-enable (100%) rename 7.1/{alpine => alpine3.4/cli}/docker-php-ext-install (100%) rename 7.1/{alpine => alpine3.4/cli}/docker-php-source (100%) rename 7.1/{fpm/alpine => alpine3.4/fpm}/Dockerfile (100%) rename 7.1/{fpm/alpine => alpine3.4/fpm}/docker-php-entrypoint (100%) rename 7.1/{apache => alpine3.4/fpm}/docker-php-ext-configure (100%) rename 7.1/{apache => alpine3.4/fpm}/docker-php-ext-enable (100%) rename 7.1/{apache => alpine3.4/fpm}/docker-php-ext-install (100%) rename 7.1/{apache => alpine3.4/fpm}/docker-php-source (100%) rename 7.1/{zts/alpine => alpine3.4/zts}/Dockerfile (100%) rename 7.1/{ => alpine3.4/zts}/docker-php-entrypoint (100%) rename 7.1/{ => alpine3.4/zts}/docker-php-ext-configure (100%) rename 7.1/{ => alpine3.4/zts}/docker-php-ext-enable (100%) rename 7.1/{ => alpine3.4/zts}/docker-php-ext-install (100%) rename 7.1/{ => alpine3.4/zts}/docker-php-source (100%) rename 7.1/{ => jessie}/apache/Dockerfile (100%) rename 7.1/{ => jessie}/apache/apache2-foreground (100%) rename 7.1/{ => jessie}/apache/docker-php-entrypoint (100%) rename 7.1/{fpm/alpine => jessie/apache}/docker-php-ext-configure (100%) rename 7.1/{fpm/alpine => jessie/apache}/docker-php-ext-enable (100%) rename 7.1/{fpm/alpine => jessie/apache}/docker-php-ext-install (100%) rename 7.1/{fpm/alpine => jessie/apache}/docker-php-source (100%) rename 7.1/{ => jessie/cli}/Dockerfile (100%) rename 7.1/{zts/alpine => jessie/cli}/docker-php-entrypoint (100%) rename 7.1/{fpm => jessie/cli}/docker-php-ext-configure (100%) rename 7.1/{fpm => jessie/cli}/docker-php-ext-enable (100%) rename 7.1/{fpm => jessie/cli}/docker-php-ext-install (100%) rename 7.1/{fpm => jessie/cli}/docker-php-source (100%) rename 7.1/{ => jessie}/fpm/Dockerfile (100%) rename 7.1/{ => jessie}/fpm/docker-php-entrypoint (100%) rename 7.1/{zts/alpine => jessie/fpm}/docker-php-ext-configure (100%) rename 7.1/{zts/alpine => jessie/fpm}/docker-php-ext-enable (100%) rename 7.1/{zts/alpine => jessie/fpm}/docker-php-ext-install (100%) rename 7.1/{zts/alpine => jessie/fpm}/docker-php-source (100%) rename 7.1/{ => jessie}/zts/Dockerfile (100%) rename 7.1/{ => jessie}/zts/docker-php-entrypoint (100%) rename 7.1/{ => jessie}/zts/docker-php-ext-configure (100%) rename 7.1/{ => jessie}/zts/docker-php-ext-enable (100%) rename 7.1/{ => jessie}/zts/docker-php-ext-install (100%) rename 7.1/{ => jessie}/zts/docker-php-source (100%) rename 7.2-rc/{alpine => alpine3.6/cli}/Dockerfile (100%) rename 7.2-rc/{alpine => alpine3.6/cli}/docker-php-entrypoint (100%) rename 7.2-rc/{alpine => alpine3.6/cli}/docker-php-ext-configure (100%) rename 7.2-rc/{alpine => alpine3.6/cli}/docker-php-ext-enable (100%) rename 7.2-rc/{alpine => alpine3.6/cli}/docker-php-ext-install (100%) rename 7.2-rc/{alpine => alpine3.6/cli}/docker-php-source (100%) rename 7.2-rc/{fpm/alpine => alpine3.6/fpm}/Dockerfile (100%) rename 7.2-rc/{fpm/alpine => alpine3.6/fpm}/docker-php-entrypoint (100%) rename 7.2-rc/{apache => alpine3.6/fpm}/docker-php-ext-configure (100%) rename 7.2-rc/{apache => alpine3.6/fpm}/docker-php-ext-enable (100%) rename 7.2-rc/{apache => alpine3.6/fpm}/docker-php-ext-install (100%) rename 7.2-rc/{apache => alpine3.6/fpm}/docker-php-source (100%) rename 7.2-rc/{zts/alpine => alpine3.6/zts}/Dockerfile (100%) rename 7.2-rc/{ => alpine3.6/zts}/docker-php-entrypoint (100%) rename 7.2-rc/{ => alpine3.6/zts}/docker-php-ext-configure (100%) rename 7.2-rc/{ => alpine3.6/zts}/docker-php-ext-enable (100%) rename 7.2-rc/{ => alpine3.6/zts}/docker-php-ext-install (100%) rename 7.2-rc/{ => alpine3.6/zts}/docker-php-source (100%) rename 7.2-rc/{ => stretch-slim}/apache/Dockerfile (100%) rename 7.2-rc/{ => stretch-slim}/apache/apache2-foreground (100%) rename 7.2-rc/{ => stretch-slim}/apache/docker-php-entrypoint (100%) rename 7.2-rc/{fpm/alpine => stretch-slim/apache}/docker-php-ext-configure (100%) rename 7.2-rc/{fpm/alpine => stretch-slim/apache}/docker-php-ext-enable (100%) rename 7.2-rc/{fpm/alpine => stretch-slim/apache}/docker-php-ext-install (100%) rename 7.2-rc/{fpm/alpine => stretch-slim/apache}/docker-php-source (100%) rename 7.2-rc/{ => stretch-slim/cli}/Dockerfile (100%) rename 7.2-rc/{zts/alpine => stretch-slim/cli}/docker-php-entrypoint (100%) rename 7.2-rc/{fpm => stretch-slim/cli}/docker-php-ext-configure (100%) rename 7.2-rc/{fpm => stretch-slim/cli}/docker-php-ext-enable (100%) rename 7.2-rc/{fpm => stretch-slim/cli}/docker-php-ext-install (100%) rename 7.2-rc/{fpm => stretch-slim/cli}/docker-php-source (100%) rename 7.2-rc/{ => stretch-slim}/fpm/Dockerfile (100%) rename 7.2-rc/{ => stretch-slim}/fpm/docker-php-entrypoint (100%) rename 7.2-rc/{zts/alpine => stretch-slim/fpm}/docker-php-ext-configure (100%) rename 7.2-rc/{zts/alpine => stretch-slim/fpm}/docker-php-ext-enable (100%) rename 7.2-rc/{zts/alpine => stretch-slim/fpm}/docker-php-ext-install (100%) rename 7.2-rc/{zts/alpine => stretch-slim/fpm}/docker-php-source (100%) rename 7.2-rc/{ => stretch-slim}/zts/Dockerfile (100%) rename 7.2-rc/{ => stretch-slim}/zts/docker-php-entrypoint (100%) rename 7.2-rc/{ => stretch-slim}/zts/docker-php-ext-configure (100%) rename 7.2-rc/{ => stretch-slim}/zts/docker-php-ext-enable (100%) rename 7.2-rc/{ => stretch-slim}/zts/docker-php-ext-install (100%) rename 7.2-rc/{ => stretch-slim}/zts/docker-php-source (100%) diff --git a/.travis.yml b/.travis.yml index 523a6f4f4a..987a71e9a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,46 +2,46 @@ language: bash services: docker env: - - VERSION=7.2-rc VARIANT= - - VERSION=7.2-rc VARIANT=alpine - - VERSION=7.2-rc VARIANT=apache - - VERSION=7.2-rc VARIANT=fpm - - VERSION=7.2-rc VARIANT=fpm/alpine - - VERSION=7.2-rc VARIANT=zts - - VERSION=7.2-rc VARIANT=zts/alpine - - VERSION=7.1 VARIANT= - - VERSION=7.1 VARIANT=alpine - - VERSION=7.1 VARIANT=apache - - VERSION=7.1 VARIANT=fpm - - VERSION=7.1 VARIANT=fpm/alpine - - VERSION=7.1 VARIANT=zts - - VERSION=7.1 VARIANT=zts/alpine - - VERSION=7.0 VARIANT= - - VERSION=7.0 VARIANT=alpine - - VERSION=7.0 VARIANT=apache - - VERSION=7.0 VARIANT=fpm - - VERSION=7.0 VARIANT=fpm/alpine - - VERSION=7.0 VARIANT=zts - - VERSION=7.0 VARIANT=zts/alpine - - VERSION=5.6 VARIANT= - - VERSION=5.6 VARIANT=alpine - - VERSION=5.6 VARIANT=apache - - VERSION=5.6 VARIANT=fpm - - VERSION=5.6 VARIANT=fpm/alpine - - VERSION=5.6 VARIANT=zts - - VERSION=5.6 VARIANT=zts/alpine + - VERSION=7.2-rc VARIANT=alpine3.6/cli + - VERSION=7.2-rc VARIANT=alpine3.6/fpm + - VERSION=7.2-rc VARIANT=alpine3.6/zts + - VERSION=7.2-rc VARIANT=stretch-slim/apache + - VERSION=7.2-rc VARIANT=stretch-slim/cli + - VERSION=7.2-rc VARIANT=stretch-slim/fpm + - VERSION=7.2-rc VARIANT=stretch-slim/zts + - VERSION=7.1 VARIANT=alpine3.4/cli + - VERSION=7.1 VARIANT=alpine3.4/fpm + - VERSION=7.1 VARIANT=alpine3.4/zts + - VERSION=7.1 VARIANT=jessie/apache + - VERSION=7.1 VARIANT=jessie/cli + - VERSION=7.1 VARIANT=jessie/fpm + - VERSION=7.1 VARIANT=jessie/zts + - VERSION=7.0 VARIANT=alpine3.4/cli + - VERSION=7.0 VARIANT=alpine3.4/fpm + - VERSION=7.0 VARIANT=alpine3.4/zts + - VERSION=7.0 VARIANT=jessie/apache + - VERSION=7.0 VARIANT=jessie/cli + - VERSION=7.0 VARIANT=jessie/fpm + - VERSION=7.0 VARIANT=jessie/zts + - VERSION=5.6 VARIANT=alpine3.4/cli + - VERSION=5.6 VARIANT=alpine3.4/fpm + - VERSION=5.6 VARIANT=alpine3.4/zts + - VERSION=5.6 VARIANT=jessie/apache + - VERSION=5.6 VARIANT=jessie/cli + - VERSION=5.6 VARIANT=jessie/fpm + - VERSION=5.6 VARIANT=jessie/zts install: - git clone https://github.com/docker-library/official-images.git ~/official-images before_script: - env | sort - - cd "$VERSION" - - image="php:${VERSION}${VARIANT:+-$VARIANT}" - - image="${image//'/'/-}" + - cd "$VERSION/$VARIANT" + - SUBVARIANT="${VARIANT#*/}" + - image="php:${VERSION}-${SUBVARIANT}-${VARIANT%/*}" script: - - travis_retry docker build -t "$image" "${VARIANT:-.}" + - travis_retry docker build -t "$image" . - ~/official-images/test/run.sh "$image" after_script: diff --git a/5.6/alpine/Dockerfile b/5.6/alpine3.4/cli/Dockerfile similarity index 100% rename from 5.6/alpine/Dockerfile rename to 5.6/alpine3.4/cli/Dockerfile diff --git a/5.6/alpine/docker-php-entrypoint b/5.6/alpine3.4/cli/docker-php-entrypoint similarity index 100% rename from 5.6/alpine/docker-php-entrypoint rename to 5.6/alpine3.4/cli/docker-php-entrypoint diff --git a/5.6/alpine/docker-php-ext-configure b/5.6/alpine3.4/cli/docker-php-ext-configure similarity index 100% rename from 5.6/alpine/docker-php-ext-configure rename to 5.6/alpine3.4/cli/docker-php-ext-configure diff --git a/5.6/alpine/docker-php-ext-enable b/5.6/alpine3.4/cli/docker-php-ext-enable similarity index 100% rename from 5.6/alpine/docker-php-ext-enable rename to 5.6/alpine3.4/cli/docker-php-ext-enable diff --git a/5.6/alpine/docker-php-ext-install b/5.6/alpine3.4/cli/docker-php-ext-install similarity index 100% rename from 5.6/alpine/docker-php-ext-install rename to 5.6/alpine3.4/cli/docker-php-ext-install diff --git a/5.6/alpine/docker-php-source b/5.6/alpine3.4/cli/docker-php-source similarity index 100% rename from 5.6/alpine/docker-php-source rename to 5.6/alpine3.4/cli/docker-php-source diff --git a/5.6/fpm/alpine/Dockerfile b/5.6/alpine3.4/fpm/Dockerfile similarity index 100% rename from 5.6/fpm/alpine/Dockerfile rename to 5.6/alpine3.4/fpm/Dockerfile diff --git a/5.6/fpm/alpine/docker-php-entrypoint b/5.6/alpine3.4/fpm/docker-php-entrypoint similarity index 100% rename from 5.6/fpm/alpine/docker-php-entrypoint rename to 5.6/alpine3.4/fpm/docker-php-entrypoint diff --git a/5.6/apache/docker-php-ext-configure b/5.6/alpine3.4/fpm/docker-php-ext-configure similarity index 100% rename from 5.6/apache/docker-php-ext-configure rename to 5.6/alpine3.4/fpm/docker-php-ext-configure diff --git a/5.6/apache/docker-php-ext-enable b/5.6/alpine3.4/fpm/docker-php-ext-enable similarity index 100% rename from 5.6/apache/docker-php-ext-enable rename to 5.6/alpine3.4/fpm/docker-php-ext-enable diff --git a/5.6/apache/docker-php-ext-install b/5.6/alpine3.4/fpm/docker-php-ext-install similarity index 100% rename from 5.6/apache/docker-php-ext-install rename to 5.6/alpine3.4/fpm/docker-php-ext-install diff --git a/5.6/apache/docker-php-source b/5.6/alpine3.4/fpm/docker-php-source similarity index 100% rename from 5.6/apache/docker-php-source rename to 5.6/alpine3.4/fpm/docker-php-source diff --git a/5.6/zts/alpine/Dockerfile b/5.6/alpine3.4/zts/Dockerfile similarity index 100% rename from 5.6/zts/alpine/Dockerfile rename to 5.6/alpine3.4/zts/Dockerfile diff --git a/5.6/docker-php-entrypoint b/5.6/alpine3.4/zts/docker-php-entrypoint similarity index 100% rename from 5.6/docker-php-entrypoint rename to 5.6/alpine3.4/zts/docker-php-entrypoint diff --git a/5.6/docker-php-ext-configure b/5.6/alpine3.4/zts/docker-php-ext-configure similarity index 100% rename from 5.6/docker-php-ext-configure rename to 5.6/alpine3.4/zts/docker-php-ext-configure diff --git a/5.6/docker-php-ext-enable b/5.6/alpine3.4/zts/docker-php-ext-enable similarity index 100% rename from 5.6/docker-php-ext-enable rename to 5.6/alpine3.4/zts/docker-php-ext-enable diff --git a/5.6/docker-php-ext-install b/5.6/alpine3.4/zts/docker-php-ext-install similarity index 100% rename from 5.6/docker-php-ext-install rename to 5.6/alpine3.4/zts/docker-php-ext-install diff --git a/5.6/docker-php-source b/5.6/alpine3.4/zts/docker-php-source similarity index 100% rename from 5.6/docker-php-source rename to 5.6/alpine3.4/zts/docker-php-source diff --git a/5.6/apache/Dockerfile b/5.6/jessie/apache/Dockerfile similarity index 100% rename from 5.6/apache/Dockerfile rename to 5.6/jessie/apache/Dockerfile diff --git a/5.6/apache/apache2-foreground b/5.6/jessie/apache/apache2-foreground similarity index 100% rename from 5.6/apache/apache2-foreground rename to 5.6/jessie/apache/apache2-foreground diff --git a/5.6/apache/docker-php-entrypoint b/5.6/jessie/apache/docker-php-entrypoint similarity index 100% rename from 5.6/apache/docker-php-entrypoint rename to 5.6/jessie/apache/docker-php-entrypoint diff --git a/5.6/fpm/alpine/docker-php-ext-configure b/5.6/jessie/apache/docker-php-ext-configure similarity index 100% rename from 5.6/fpm/alpine/docker-php-ext-configure rename to 5.6/jessie/apache/docker-php-ext-configure diff --git a/5.6/fpm/alpine/docker-php-ext-enable b/5.6/jessie/apache/docker-php-ext-enable similarity index 100% rename from 5.6/fpm/alpine/docker-php-ext-enable rename to 5.6/jessie/apache/docker-php-ext-enable diff --git a/5.6/fpm/alpine/docker-php-ext-install b/5.6/jessie/apache/docker-php-ext-install similarity index 100% rename from 5.6/fpm/alpine/docker-php-ext-install rename to 5.6/jessie/apache/docker-php-ext-install diff --git a/5.6/fpm/alpine/docker-php-source b/5.6/jessie/apache/docker-php-source similarity index 100% rename from 5.6/fpm/alpine/docker-php-source rename to 5.6/jessie/apache/docker-php-source diff --git a/5.6/Dockerfile b/5.6/jessie/cli/Dockerfile similarity index 100% rename from 5.6/Dockerfile rename to 5.6/jessie/cli/Dockerfile diff --git a/5.6/zts/alpine/docker-php-entrypoint b/5.6/jessie/cli/docker-php-entrypoint similarity index 100% rename from 5.6/zts/alpine/docker-php-entrypoint rename to 5.6/jessie/cli/docker-php-entrypoint diff --git a/5.6/fpm/docker-php-ext-configure b/5.6/jessie/cli/docker-php-ext-configure similarity index 100% rename from 5.6/fpm/docker-php-ext-configure rename to 5.6/jessie/cli/docker-php-ext-configure diff --git a/5.6/fpm/docker-php-ext-enable b/5.6/jessie/cli/docker-php-ext-enable similarity index 100% rename from 5.6/fpm/docker-php-ext-enable rename to 5.6/jessie/cli/docker-php-ext-enable diff --git a/5.6/fpm/docker-php-ext-install b/5.6/jessie/cli/docker-php-ext-install similarity index 100% rename from 5.6/fpm/docker-php-ext-install rename to 5.6/jessie/cli/docker-php-ext-install diff --git a/5.6/fpm/docker-php-source b/5.6/jessie/cli/docker-php-source similarity index 100% rename from 5.6/fpm/docker-php-source rename to 5.6/jessie/cli/docker-php-source diff --git a/5.6/fpm/Dockerfile b/5.6/jessie/fpm/Dockerfile similarity index 100% rename from 5.6/fpm/Dockerfile rename to 5.6/jessie/fpm/Dockerfile diff --git a/5.6/fpm/docker-php-entrypoint b/5.6/jessie/fpm/docker-php-entrypoint similarity index 100% rename from 5.6/fpm/docker-php-entrypoint rename to 5.6/jessie/fpm/docker-php-entrypoint diff --git a/5.6/zts/alpine/docker-php-ext-configure b/5.6/jessie/fpm/docker-php-ext-configure similarity index 100% rename from 5.6/zts/alpine/docker-php-ext-configure rename to 5.6/jessie/fpm/docker-php-ext-configure diff --git a/5.6/zts/alpine/docker-php-ext-enable b/5.6/jessie/fpm/docker-php-ext-enable similarity index 100% rename from 5.6/zts/alpine/docker-php-ext-enable rename to 5.6/jessie/fpm/docker-php-ext-enable diff --git a/5.6/zts/alpine/docker-php-ext-install b/5.6/jessie/fpm/docker-php-ext-install similarity index 100% rename from 5.6/zts/alpine/docker-php-ext-install rename to 5.6/jessie/fpm/docker-php-ext-install diff --git a/5.6/zts/alpine/docker-php-source b/5.6/jessie/fpm/docker-php-source similarity index 100% rename from 5.6/zts/alpine/docker-php-source rename to 5.6/jessie/fpm/docker-php-source diff --git a/5.6/zts/Dockerfile b/5.6/jessie/zts/Dockerfile similarity index 100% rename from 5.6/zts/Dockerfile rename to 5.6/jessie/zts/Dockerfile diff --git a/5.6/zts/docker-php-entrypoint b/5.6/jessie/zts/docker-php-entrypoint similarity index 100% rename from 5.6/zts/docker-php-entrypoint rename to 5.6/jessie/zts/docker-php-entrypoint diff --git a/5.6/zts/docker-php-ext-configure b/5.6/jessie/zts/docker-php-ext-configure similarity index 100% rename from 5.6/zts/docker-php-ext-configure rename to 5.6/jessie/zts/docker-php-ext-configure diff --git a/5.6/zts/docker-php-ext-enable b/5.6/jessie/zts/docker-php-ext-enable similarity index 100% rename from 5.6/zts/docker-php-ext-enable rename to 5.6/jessie/zts/docker-php-ext-enable diff --git a/5.6/zts/docker-php-ext-install b/5.6/jessie/zts/docker-php-ext-install similarity index 100% rename from 5.6/zts/docker-php-ext-install rename to 5.6/jessie/zts/docker-php-ext-install diff --git a/5.6/zts/docker-php-source b/5.6/jessie/zts/docker-php-source similarity index 100% rename from 5.6/zts/docker-php-source rename to 5.6/jessie/zts/docker-php-source diff --git a/7.0/alpine/Dockerfile b/7.0/alpine3.4/cli/Dockerfile similarity index 100% rename from 7.0/alpine/Dockerfile rename to 7.0/alpine3.4/cli/Dockerfile diff --git a/7.0/alpine/docker-php-entrypoint b/7.0/alpine3.4/cli/docker-php-entrypoint similarity index 100% rename from 7.0/alpine/docker-php-entrypoint rename to 7.0/alpine3.4/cli/docker-php-entrypoint diff --git a/7.0/alpine/docker-php-ext-configure b/7.0/alpine3.4/cli/docker-php-ext-configure similarity index 100% rename from 7.0/alpine/docker-php-ext-configure rename to 7.0/alpine3.4/cli/docker-php-ext-configure diff --git a/7.0/alpine/docker-php-ext-enable b/7.0/alpine3.4/cli/docker-php-ext-enable similarity index 100% rename from 7.0/alpine/docker-php-ext-enable rename to 7.0/alpine3.4/cli/docker-php-ext-enable diff --git a/7.0/alpine/docker-php-ext-install b/7.0/alpine3.4/cli/docker-php-ext-install similarity index 100% rename from 7.0/alpine/docker-php-ext-install rename to 7.0/alpine3.4/cli/docker-php-ext-install diff --git a/7.0/alpine/docker-php-source b/7.0/alpine3.4/cli/docker-php-source similarity index 100% rename from 7.0/alpine/docker-php-source rename to 7.0/alpine3.4/cli/docker-php-source diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/alpine3.4/fpm/Dockerfile similarity index 100% rename from 7.0/fpm/alpine/Dockerfile rename to 7.0/alpine3.4/fpm/Dockerfile diff --git a/7.0/fpm/alpine/docker-php-entrypoint b/7.0/alpine3.4/fpm/docker-php-entrypoint similarity index 100% rename from 7.0/fpm/alpine/docker-php-entrypoint rename to 7.0/alpine3.4/fpm/docker-php-entrypoint diff --git a/7.0/apache/docker-php-ext-configure b/7.0/alpine3.4/fpm/docker-php-ext-configure similarity index 100% rename from 7.0/apache/docker-php-ext-configure rename to 7.0/alpine3.4/fpm/docker-php-ext-configure diff --git a/7.0/apache/docker-php-ext-enable b/7.0/alpine3.4/fpm/docker-php-ext-enable similarity index 100% rename from 7.0/apache/docker-php-ext-enable rename to 7.0/alpine3.4/fpm/docker-php-ext-enable diff --git a/7.0/apache/docker-php-ext-install b/7.0/alpine3.4/fpm/docker-php-ext-install similarity index 100% rename from 7.0/apache/docker-php-ext-install rename to 7.0/alpine3.4/fpm/docker-php-ext-install diff --git a/7.0/apache/docker-php-source b/7.0/alpine3.4/fpm/docker-php-source similarity index 100% rename from 7.0/apache/docker-php-source rename to 7.0/alpine3.4/fpm/docker-php-source diff --git a/7.0/zts/alpine/Dockerfile b/7.0/alpine3.4/zts/Dockerfile similarity index 100% rename from 7.0/zts/alpine/Dockerfile rename to 7.0/alpine3.4/zts/Dockerfile diff --git a/7.0/docker-php-entrypoint b/7.0/alpine3.4/zts/docker-php-entrypoint similarity index 100% rename from 7.0/docker-php-entrypoint rename to 7.0/alpine3.4/zts/docker-php-entrypoint diff --git a/7.0/docker-php-ext-configure b/7.0/alpine3.4/zts/docker-php-ext-configure similarity index 100% rename from 7.0/docker-php-ext-configure rename to 7.0/alpine3.4/zts/docker-php-ext-configure diff --git a/7.0/docker-php-ext-enable b/7.0/alpine3.4/zts/docker-php-ext-enable similarity index 100% rename from 7.0/docker-php-ext-enable rename to 7.0/alpine3.4/zts/docker-php-ext-enable diff --git a/7.0/docker-php-ext-install b/7.0/alpine3.4/zts/docker-php-ext-install similarity index 100% rename from 7.0/docker-php-ext-install rename to 7.0/alpine3.4/zts/docker-php-ext-install diff --git a/7.0/docker-php-source b/7.0/alpine3.4/zts/docker-php-source similarity index 100% rename from 7.0/docker-php-source rename to 7.0/alpine3.4/zts/docker-php-source diff --git a/7.0/apache/Dockerfile b/7.0/jessie/apache/Dockerfile similarity index 100% rename from 7.0/apache/Dockerfile rename to 7.0/jessie/apache/Dockerfile diff --git a/7.0/apache/apache2-foreground b/7.0/jessie/apache/apache2-foreground similarity index 100% rename from 7.0/apache/apache2-foreground rename to 7.0/jessie/apache/apache2-foreground diff --git a/7.0/apache/docker-php-entrypoint b/7.0/jessie/apache/docker-php-entrypoint similarity index 100% rename from 7.0/apache/docker-php-entrypoint rename to 7.0/jessie/apache/docker-php-entrypoint diff --git a/7.0/fpm/alpine/docker-php-ext-configure b/7.0/jessie/apache/docker-php-ext-configure similarity index 100% rename from 7.0/fpm/alpine/docker-php-ext-configure rename to 7.0/jessie/apache/docker-php-ext-configure diff --git a/7.0/fpm/alpine/docker-php-ext-enable b/7.0/jessie/apache/docker-php-ext-enable similarity index 100% rename from 7.0/fpm/alpine/docker-php-ext-enable rename to 7.0/jessie/apache/docker-php-ext-enable diff --git a/7.0/fpm/alpine/docker-php-ext-install b/7.0/jessie/apache/docker-php-ext-install similarity index 100% rename from 7.0/fpm/alpine/docker-php-ext-install rename to 7.0/jessie/apache/docker-php-ext-install diff --git a/7.0/fpm/alpine/docker-php-source b/7.0/jessie/apache/docker-php-source similarity index 100% rename from 7.0/fpm/alpine/docker-php-source rename to 7.0/jessie/apache/docker-php-source diff --git a/7.0/Dockerfile b/7.0/jessie/cli/Dockerfile similarity index 100% rename from 7.0/Dockerfile rename to 7.0/jessie/cli/Dockerfile diff --git a/7.0/zts/alpine/docker-php-entrypoint b/7.0/jessie/cli/docker-php-entrypoint similarity index 100% rename from 7.0/zts/alpine/docker-php-entrypoint rename to 7.0/jessie/cli/docker-php-entrypoint diff --git a/7.0/fpm/docker-php-ext-configure b/7.0/jessie/cli/docker-php-ext-configure similarity index 100% rename from 7.0/fpm/docker-php-ext-configure rename to 7.0/jessie/cli/docker-php-ext-configure diff --git a/7.0/fpm/docker-php-ext-enable b/7.0/jessie/cli/docker-php-ext-enable similarity index 100% rename from 7.0/fpm/docker-php-ext-enable rename to 7.0/jessie/cli/docker-php-ext-enable diff --git a/7.0/fpm/docker-php-ext-install b/7.0/jessie/cli/docker-php-ext-install similarity index 100% rename from 7.0/fpm/docker-php-ext-install rename to 7.0/jessie/cli/docker-php-ext-install diff --git a/7.0/fpm/docker-php-source b/7.0/jessie/cli/docker-php-source similarity index 100% rename from 7.0/fpm/docker-php-source rename to 7.0/jessie/cli/docker-php-source diff --git a/7.0/fpm/Dockerfile b/7.0/jessie/fpm/Dockerfile similarity index 100% rename from 7.0/fpm/Dockerfile rename to 7.0/jessie/fpm/Dockerfile diff --git a/7.0/fpm/docker-php-entrypoint b/7.0/jessie/fpm/docker-php-entrypoint similarity index 100% rename from 7.0/fpm/docker-php-entrypoint rename to 7.0/jessie/fpm/docker-php-entrypoint diff --git a/7.0/zts/alpine/docker-php-ext-configure b/7.0/jessie/fpm/docker-php-ext-configure similarity index 100% rename from 7.0/zts/alpine/docker-php-ext-configure rename to 7.0/jessie/fpm/docker-php-ext-configure diff --git a/7.0/zts/alpine/docker-php-ext-enable b/7.0/jessie/fpm/docker-php-ext-enable similarity index 100% rename from 7.0/zts/alpine/docker-php-ext-enable rename to 7.0/jessie/fpm/docker-php-ext-enable diff --git a/7.0/zts/alpine/docker-php-ext-install b/7.0/jessie/fpm/docker-php-ext-install similarity index 100% rename from 7.0/zts/alpine/docker-php-ext-install rename to 7.0/jessie/fpm/docker-php-ext-install diff --git a/7.0/zts/alpine/docker-php-source b/7.0/jessie/fpm/docker-php-source similarity index 100% rename from 7.0/zts/alpine/docker-php-source rename to 7.0/jessie/fpm/docker-php-source diff --git a/7.0/zts/Dockerfile b/7.0/jessie/zts/Dockerfile similarity index 100% rename from 7.0/zts/Dockerfile rename to 7.0/jessie/zts/Dockerfile diff --git a/7.0/zts/docker-php-entrypoint b/7.0/jessie/zts/docker-php-entrypoint similarity index 100% rename from 7.0/zts/docker-php-entrypoint rename to 7.0/jessie/zts/docker-php-entrypoint diff --git a/7.0/zts/docker-php-ext-configure b/7.0/jessie/zts/docker-php-ext-configure similarity index 100% rename from 7.0/zts/docker-php-ext-configure rename to 7.0/jessie/zts/docker-php-ext-configure diff --git a/7.0/zts/docker-php-ext-enable b/7.0/jessie/zts/docker-php-ext-enable similarity index 100% rename from 7.0/zts/docker-php-ext-enable rename to 7.0/jessie/zts/docker-php-ext-enable diff --git a/7.0/zts/docker-php-ext-install b/7.0/jessie/zts/docker-php-ext-install similarity index 100% rename from 7.0/zts/docker-php-ext-install rename to 7.0/jessie/zts/docker-php-ext-install diff --git a/7.0/zts/docker-php-source b/7.0/jessie/zts/docker-php-source similarity index 100% rename from 7.0/zts/docker-php-source rename to 7.0/jessie/zts/docker-php-source diff --git a/7.1/alpine/Dockerfile b/7.1/alpine3.4/cli/Dockerfile similarity index 100% rename from 7.1/alpine/Dockerfile rename to 7.1/alpine3.4/cli/Dockerfile diff --git a/7.1/alpine/docker-php-entrypoint b/7.1/alpine3.4/cli/docker-php-entrypoint similarity index 100% rename from 7.1/alpine/docker-php-entrypoint rename to 7.1/alpine3.4/cli/docker-php-entrypoint diff --git a/7.1/alpine/docker-php-ext-configure b/7.1/alpine3.4/cli/docker-php-ext-configure similarity index 100% rename from 7.1/alpine/docker-php-ext-configure rename to 7.1/alpine3.4/cli/docker-php-ext-configure diff --git a/7.1/alpine/docker-php-ext-enable b/7.1/alpine3.4/cli/docker-php-ext-enable similarity index 100% rename from 7.1/alpine/docker-php-ext-enable rename to 7.1/alpine3.4/cli/docker-php-ext-enable diff --git a/7.1/alpine/docker-php-ext-install b/7.1/alpine3.4/cli/docker-php-ext-install similarity index 100% rename from 7.1/alpine/docker-php-ext-install rename to 7.1/alpine3.4/cli/docker-php-ext-install diff --git a/7.1/alpine/docker-php-source b/7.1/alpine3.4/cli/docker-php-source similarity index 100% rename from 7.1/alpine/docker-php-source rename to 7.1/alpine3.4/cli/docker-php-source diff --git a/7.1/fpm/alpine/Dockerfile b/7.1/alpine3.4/fpm/Dockerfile similarity index 100% rename from 7.1/fpm/alpine/Dockerfile rename to 7.1/alpine3.4/fpm/Dockerfile diff --git a/7.1/fpm/alpine/docker-php-entrypoint b/7.1/alpine3.4/fpm/docker-php-entrypoint similarity index 100% rename from 7.1/fpm/alpine/docker-php-entrypoint rename to 7.1/alpine3.4/fpm/docker-php-entrypoint diff --git a/7.1/apache/docker-php-ext-configure b/7.1/alpine3.4/fpm/docker-php-ext-configure similarity index 100% rename from 7.1/apache/docker-php-ext-configure rename to 7.1/alpine3.4/fpm/docker-php-ext-configure diff --git a/7.1/apache/docker-php-ext-enable b/7.1/alpine3.4/fpm/docker-php-ext-enable similarity index 100% rename from 7.1/apache/docker-php-ext-enable rename to 7.1/alpine3.4/fpm/docker-php-ext-enable diff --git a/7.1/apache/docker-php-ext-install b/7.1/alpine3.4/fpm/docker-php-ext-install similarity index 100% rename from 7.1/apache/docker-php-ext-install rename to 7.1/alpine3.4/fpm/docker-php-ext-install diff --git a/7.1/apache/docker-php-source b/7.1/alpine3.4/fpm/docker-php-source similarity index 100% rename from 7.1/apache/docker-php-source rename to 7.1/alpine3.4/fpm/docker-php-source diff --git a/7.1/zts/alpine/Dockerfile b/7.1/alpine3.4/zts/Dockerfile similarity index 100% rename from 7.1/zts/alpine/Dockerfile rename to 7.1/alpine3.4/zts/Dockerfile diff --git a/7.1/docker-php-entrypoint b/7.1/alpine3.4/zts/docker-php-entrypoint similarity index 100% rename from 7.1/docker-php-entrypoint rename to 7.1/alpine3.4/zts/docker-php-entrypoint diff --git a/7.1/docker-php-ext-configure b/7.1/alpine3.4/zts/docker-php-ext-configure similarity index 100% rename from 7.1/docker-php-ext-configure rename to 7.1/alpine3.4/zts/docker-php-ext-configure diff --git a/7.1/docker-php-ext-enable b/7.1/alpine3.4/zts/docker-php-ext-enable similarity index 100% rename from 7.1/docker-php-ext-enable rename to 7.1/alpine3.4/zts/docker-php-ext-enable diff --git a/7.1/docker-php-ext-install b/7.1/alpine3.4/zts/docker-php-ext-install similarity index 100% rename from 7.1/docker-php-ext-install rename to 7.1/alpine3.4/zts/docker-php-ext-install diff --git a/7.1/docker-php-source b/7.1/alpine3.4/zts/docker-php-source similarity index 100% rename from 7.1/docker-php-source rename to 7.1/alpine3.4/zts/docker-php-source diff --git a/7.1/apache/Dockerfile b/7.1/jessie/apache/Dockerfile similarity index 100% rename from 7.1/apache/Dockerfile rename to 7.1/jessie/apache/Dockerfile diff --git a/7.1/apache/apache2-foreground b/7.1/jessie/apache/apache2-foreground similarity index 100% rename from 7.1/apache/apache2-foreground rename to 7.1/jessie/apache/apache2-foreground diff --git a/7.1/apache/docker-php-entrypoint b/7.1/jessie/apache/docker-php-entrypoint similarity index 100% rename from 7.1/apache/docker-php-entrypoint rename to 7.1/jessie/apache/docker-php-entrypoint diff --git a/7.1/fpm/alpine/docker-php-ext-configure b/7.1/jessie/apache/docker-php-ext-configure similarity index 100% rename from 7.1/fpm/alpine/docker-php-ext-configure rename to 7.1/jessie/apache/docker-php-ext-configure diff --git a/7.1/fpm/alpine/docker-php-ext-enable b/7.1/jessie/apache/docker-php-ext-enable similarity index 100% rename from 7.1/fpm/alpine/docker-php-ext-enable rename to 7.1/jessie/apache/docker-php-ext-enable diff --git a/7.1/fpm/alpine/docker-php-ext-install b/7.1/jessie/apache/docker-php-ext-install similarity index 100% rename from 7.1/fpm/alpine/docker-php-ext-install rename to 7.1/jessie/apache/docker-php-ext-install diff --git a/7.1/fpm/alpine/docker-php-source b/7.1/jessie/apache/docker-php-source similarity index 100% rename from 7.1/fpm/alpine/docker-php-source rename to 7.1/jessie/apache/docker-php-source diff --git a/7.1/Dockerfile b/7.1/jessie/cli/Dockerfile similarity index 100% rename from 7.1/Dockerfile rename to 7.1/jessie/cli/Dockerfile diff --git a/7.1/zts/alpine/docker-php-entrypoint b/7.1/jessie/cli/docker-php-entrypoint similarity index 100% rename from 7.1/zts/alpine/docker-php-entrypoint rename to 7.1/jessie/cli/docker-php-entrypoint diff --git a/7.1/fpm/docker-php-ext-configure b/7.1/jessie/cli/docker-php-ext-configure similarity index 100% rename from 7.1/fpm/docker-php-ext-configure rename to 7.1/jessie/cli/docker-php-ext-configure diff --git a/7.1/fpm/docker-php-ext-enable b/7.1/jessie/cli/docker-php-ext-enable similarity index 100% rename from 7.1/fpm/docker-php-ext-enable rename to 7.1/jessie/cli/docker-php-ext-enable diff --git a/7.1/fpm/docker-php-ext-install b/7.1/jessie/cli/docker-php-ext-install similarity index 100% rename from 7.1/fpm/docker-php-ext-install rename to 7.1/jessie/cli/docker-php-ext-install diff --git a/7.1/fpm/docker-php-source b/7.1/jessie/cli/docker-php-source similarity index 100% rename from 7.1/fpm/docker-php-source rename to 7.1/jessie/cli/docker-php-source diff --git a/7.1/fpm/Dockerfile b/7.1/jessie/fpm/Dockerfile similarity index 100% rename from 7.1/fpm/Dockerfile rename to 7.1/jessie/fpm/Dockerfile diff --git a/7.1/fpm/docker-php-entrypoint b/7.1/jessie/fpm/docker-php-entrypoint similarity index 100% rename from 7.1/fpm/docker-php-entrypoint rename to 7.1/jessie/fpm/docker-php-entrypoint diff --git a/7.1/zts/alpine/docker-php-ext-configure b/7.1/jessie/fpm/docker-php-ext-configure similarity index 100% rename from 7.1/zts/alpine/docker-php-ext-configure rename to 7.1/jessie/fpm/docker-php-ext-configure diff --git a/7.1/zts/alpine/docker-php-ext-enable b/7.1/jessie/fpm/docker-php-ext-enable similarity index 100% rename from 7.1/zts/alpine/docker-php-ext-enable rename to 7.1/jessie/fpm/docker-php-ext-enable diff --git a/7.1/zts/alpine/docker-php-ext-install b/7.1/jessie/fpm/docker-php-ext-install similarity index 100% rename from 7.1/zts/alpine/docker-php-ext-install rename to 7.1/jessie/fpm/docker-php-ext-install diff --git a/7.1/zts/alpine/docker-php-source b/7.1/jessie/fpm/docker-php-source similarity index 100% rename from 7.1/zts/alpine/docker-php-source rename to 7.1/jessie/fpm/docker-php-source diff --git a/7.1/zts/Dockerfile b/7.1/jessie/zts/Dockerfile similarity index 100% rename from 7.1/zts/Dockerfile rename to 7.1/jessie/zts/Dockerfile diff --git a/7.1/zts/docker-php-entrypoint b/7.1/jessie/zts/docker-php-entrypoint similarity index 100% rename from 7.1/zts/docker-php-entrypoint rename to 7.1/jessie/zts/docker-php-entrypoint diff --git a/7.1/zts/docker-php-ext-configure b/7.1/jessie/zts/docker-php-ext-configure similarity index 100% rename from 7.1/zts/docker-php-ext-configure rename to 7.1/jessie/zts/docker-php-ext-configure diff --git a/7.1/zts/docker-php-ext-enable b/7.1/jessie/zts/docker-php-ext-enable similarity index 100% rename from 7.1/zts/docker-php-ext-enable rename to 7.1/jessie/zts/docker-php-ext-enable diff --git a/7.1/zts/docker-php-ext-install b/7.1/jessie/zts/docker-php-ext-install similarity index 100% rename from 7.1/zts/docker-php-ext-install rename to 7.1/jessie/zts/docker-php-ext-install diff --git a/7.1/zts/docker-php-source b/7.1/jessie/zts/docker-php-source similarity index 100% rename from 7.1/zts/docker-php-source rename to 7.1/jessie/zts/docker-php-source diff --git a/7.2-rc/alpine/Dockerfile b/7.2-rc/alpine3.6/cli/Dockerfile similarity index 100% rename from 7.2-rc/alpine/Dockerfile rename to 7.2-rc/alpine3.6/cli/Dockerfile diff --git a/7.2-rc/alpine/docker-php-entrypoint b/7.2-rc/alpine3.6/cli/docker-php-entrypoint similarity index 100% rename from 7.2-rc/alpine/docker-php-entrypoint rename to 7.2-rc/alpine3.6/cli/docker-php-entrypoint diff --git a/7.2-rc/alpine/docker-php-ext-configure b/7.2-rc/alpine3.6/cli/docker-php-ext-configure similarity index 100% rename from 7.2-rc/alpine/docker-php-ext-configure rename to 7.2-rc/alpine3.6/cli/docker-php-ext-configure diff --git a/7.2-rc/alpine/docker-php-ext-enable b/7.2-rc/alpine3.6/cli/docker-php-ext-enable similarity index 100% rename from 7.2-rc/alpine/docker-php-ext-enable rename to 7.2-rc/alpine3.6/cli/docker-php-ext-enable diff --git a/7.2-rc/alpine/docker-php-ext-install b/7.2-rc/alpine3.6/cli/docker-php-ext-install similarity index 100% rename from 7.2-rc/alpine/docker-php-ext-install rename to 7.2-rc/alpine3.6/cli/docker-php-ext-install diff --git a/7.2-rc/alpine/docker-php-source b/7.2-rc/alpine3.6/cli/docker-php-source similarity index 100% rename from 7.2-rc/alpine/docker-php-source rename to 7.2-rc/alpine3.6/cli/docker-php-source diff --git a/7.2-rc/fpm/alpine/Dockerfile b/7.2-rc/alpine3.6/fpm/Dockerfile similarity index 100% rename from 7.2-rc/fpm/alpine/Dockerfile rename to 7.2-rc/alpine3.6/fpm/Dockerfile diff --git a/7.2-rc/fpm/alpine/docker-php-entrypoint b/7.2-rc/alpine3.6/fpm/docker-php-entrypoint similarity index 100% rename from 7.2-rc/fpm/alpine/docker-php-entrypoint rename to 7.2-rc/alpine3.6/fpm/docker-php-entrypoint diff --git a/7.2-rc/apache/docker-php-ext-configure b/7.2-rc/alpine3.6/fpm/docker-php-ext-configure similarity index 100% rename from 7.2-rc/apache/docker-php-ext-configure rename to 7.2-rc/alpine3.6/fpm/docker-php-ext-configure diff --git a/7.2-rc/apache/docker-php-ext-enable b/7.2-rc/alpine3.6/fpm/docker-php-ext-enable similarity index 100% rename from 7.2-rc/apache/docker-php-ext-enable rename to 7.2-rc/alpine3.6/fpm/docker-php-ext-enable diff --git a/7.2-rc/apache/docker-php-ext-install b/7.2-rc/alpine3.6/fpm/docker-php-ext-install similarity index 100% rename from 7.2-rc/apache/docker-php-ext-install rename to 7.2-rc/alpine3.6/fpm/docker-php-ext-install diff --git a/7.2-rc/apache/docker-php-source b/7.2-rc/alpine3.6/fpm/docker-php-source similarity index 100% rename from 7.2-rc/apache/docker-php-source rename to 7.2-rc/alpine3.6/fpm/docker-php-source diff --git a/7.2-rc/zts/alpine/Dockerfile b/7.2-rc/alpine3.6/zts/Dockerfile similarity index 100% rename from 7.2-rc/zts/alpine/Dockerfile rename to 7.2-rc/alpine3.6/zts/Dockerfile diff --git a/7.2-rc/docker-php-entrypoint b/7.2-rc/alpine3.6/zts/docker-php-entrypoint similarity index 100% rename from 7.2-rc/docker-php-entrypoint rename to 7.2-rc/alpine3.6/zts/docker-php-entrypoint diff --git a/7.2-rc/docker-php-ext-configure b/7.2-rc/alpine3.6/zts/docker-php-ext-configure similarity index 100% rename from 7.2-rc/docker-php-ext-configure rename to 7.2-rc/alpine3.6/zts/docker-php-ext-configure diff --git a/7.2-rc/docker-php-ext-enable b/7.2-rc/alpine3.6/zts/docker-php-ext-enable similarity index 100% rename from 7.2-rc/docker-php-ext-enable rename to 7.2-rc/alpine3.6/zts/docker-php-ext-enable diff --git a/7.2-rc/docker-php-ext-install b/7.2-rc/alpine3.6/zts/docker-php-ext-install similarity index 100% rename from 7.2-rc/docker-php-ext-install rename to 7.2-rc/alpine3.6/zts/docker-php-ext-install diff --git a/7.2-rc/docker-php-source b/7.2-rc/alpine3.6/zts/docker-php-source similarity index 100% rename from 7.2-rc/docker-php-source rename to 7.2-rc/alpine3.6/zts/docker-php-source diff --git a/7.2-rc/apache/Dockerfile b/7.2-rc/stretch-slim/apache/Dockerfile similarity index 100% rename from 7.2-rc/apache/Dockerfile rename to 7.2-rc/stretch-slim/apache/Dockerfile diff --git a/7.2-rc/apache/apache2-foreground b/7.2-rc/stretch-slim/apache/apache2-foreground similarity index 100% rename from 7.2-rc/apache/apache2-foreground rename to 7.2-rc/stretch-slim/apache/apache2-foreground diff --git a/7.2-rc/apache/docker-php-entrypoint b/7.2-rc/stretch-slim/apache/docker-php-entrypoint similarity index 100% rename from 7.2-rc/apache/docker-php-entrypoint rename to 7.2-rc/stretch-slim/apache/docker-php-entrypoint diff --git a/7.2-rc/fpm/alpine/docker-php-ext-configure b/7.2-rc/stretch-slim/apache/docker-php-ext-configure similarity index 100% rename from 7.2-rc/fpm/alpine/docker-php-ext-configure rename to 7.2-rc/stretch-slim/apache/docker-php-ext-configure diff --git a/7.2-rc/fpm/alpine/docker-php-ext-enable b/7.2-rc/stretch-slim/apache/docker-php-ext-enable similarity index 100% rename from 7.2-rc/fpm/alpine/docker-php-ext-enable rename to 7.2-rc/stretch-slim/apache/docker-php-ext-enable diff --git a/7.2-rc/fpm/alpine/docker-php-ext-install b/7.2-rc/stretch-slim/apache/docker-php-ext-install similarity index 100% rename from 7.2-rc/fpm/alpine/docker-php-ext-install rename to 7.2-rc/stretch-slim/apache/docker-php-ext-install diff --git a/7.2-rc/fpm/alpine/docker-php-source b/7.2-rc/stretch-slim/apache/docker-php-source similarity index 100% rename from 7.2-rc/fpm/alpine/docker-php-source rename to 7.2-rc/stretch-slim/apache/docker-php-source diff --git a/7.2-rc/Dockerfile b/7.2-rc/stretch-slim/cli/Dockerfile similarity index 100% rename from 7.2-rc/Dockerfile rename to 7.2-rc/stretch-slim/cli/Dockerfile diff --git a/7.2-rc/zts/alpine/docker-php-entrypoint b/7.2-rc/stretch-slim/cli/docker-php-entrypoint similarity index 100% rename from 7.2-rc/zts/alpine/docker-php-entrypoint rename to 7.2-rc/stretch-slim/cli/docker-php-entrypoint diff --git a/7.2-rc/fpm/docker-php-ext-configure b/7.2-rc/stretch-slim/cli/docker-php-ext-configure similarity index 100% rename from 7.2-rc/fpm/docker-php-ext-configure rename to 7.2-rc/stretch-slim/cli/docker-php-ext-configure diff --git a/7.2-rc/fpm/docker-php-ext-enable b/7.2-rc/stretch-slim/cli/docker-php-ext-enable similarity index 100% rename from 7.2-rc/fpm/docker-php-ext-enable rename to 7.2-rc/stretch-slim/cli/docker-php-ext-enable diff --git a/7.2-rc/fpm/docker-php-ext-install b/7.2-rc/stretch-slim/cli/docker-php-ext-install similarity index 100% rename from 7.2-rc/fpm/docker-php-ext-install rename to 7.2-rc/stretch-slim/cli/docker-php-ext-install diff --git a/7.2-rc/fpm/docker-php-source b/7.2-rc/stretch-slim/cli/docker-php-source similarity index 100% rename from 7.2-rc/fpm/docker-php-source rename to 7.2-rc/stretch-slim/cli/docker-php-source diff --git a/7.2-rc/fpm/Dockerfile b/7.2-rc/stretch-slim/fpm/Dockerfile similarity index 100% rename from 7.2-rc/fpm/Dockerfile rename to 7.2-rc/stretch-slim/fpm/Dockerfile diff --git a/7.2-rc/fpm/docker-php-entrypoint b/7.2-rc/stretch-slim/fpm/docker-php-entrypoint similarity index 100% rename from 7.2-rc/fpm/docker-php-entrypoint rename to 7.2-rc/stretch-slim/fpm/docker-php-entrypoint diff --git a/7.2-rc/zts/alpine/docker-php-ext-configure b/7.2-rc/stretch-slim/fpm/docker-php-ext-configure similarity index 100% rename from 7.2-rc/zts/alpine/docker-php-ext-configure rename to 7.2-rc/stretch-slim/fpm/docker-php-ext-configure diff --git a/7.2-rc/zts/alpine/docker-php-ext-enable b/7.2-rc/stretch-slim/fpm/docker-php-ext-enable similarity index 100% rename from 7.2-rc/zts/alpine/docker-php-ext-enable rename to 7.2-rc/stretch-slim/fpm/docker-php-ext-enable diff --git a/7.2-rc/zts/alpine/docker-php-ext-install b/7.2-rc/stretch-slim/fpm/docker-php-ext-install similarity index 100% rename from 7.2-rc/zts/alpine/docker-php-ext-install rename to 7.2-rc/stretch-slim/fpm/docker-php-ext-install diff --git a/7.2-rc/zts/alpine/docker-php-source b/7.2-rc/stretch-slim/fpm/docker-php-source similarity index 100% rename from 7.2-rc/zts/alpine/docker-php-source rename to 7.2-rc/stretch-slim/fpm/docker-php-source diff --git a/7.2-rc/zts/Dockerfile b/7.2-rc/stretch-slim/zts/Dockerfile similarity index 100% rename from 7.2-rc/zts/Dockerfile rename to 7.2-rc/stretch-slim/zts/Dockerfile diff --git a/7.2-rc/zts/docker-php-entrypoint b/7.2-rc/stretch-slim/zts/docker-php-entrypoint similarity index 100% rename from 7.2-rc/zts/docker-php-entrypoint rename to 7.2-rc/stretch-slim/zts/docker-php-entrypoint diff --git a/7.2-rc/zts/docker-php-ext-configure b/7.2-rc/stretch-slim/zts/docker-php-ext-configure similarity index 100% rename from 7.2-rc/zts/docker-php-ext-configure rename to 7.2-rc/stretch-slim/zts/docker-php-ext-configure diff --git a/7.2-rc/zts/docker-php-ext-enable b/7.2-rc/stretch-slim/zts/docker-php-ext-enable similarity index 100% rename from 7.2-rc/zts/docker-php-ext-enable rename to 7.2-rc/stretch-slim/zts/docker-php-ext-enable diff --git a/7.2-rc/zts/docker-php-ext-install b/7.2-rc/stretch-slim/zts/docker-php-ext-install similarity index 100% rename from 7.2-rc/zts/docker-php-ext-install rename to 7.2-rc/stretch-slim/zts/docker-php-ext-install diff --git a/7.2-rc/zts/docker-php-source b/7.2-rc/stretch-slim/zts/docker-php-source similarity index 100% rename from 7.2-rc/zts/docker-php-source rename to 7.2-rc/stretch-slim/zts/docker-php-source diff --git a/update.sh b/update.sh index 54a18782e2..0bdfb88033 100755 --- a/update.sh +++ b/update.sh @@ -29,19 +29,6 @@ declare -A gpgKeys=( ) # see https://secure.php.net/downloads.php -defaultDebianSuite='stretch-slim' -declare -A debianSuites=( - [5.6]='jessie' - [7.0]='jessie' - [7.1]='jessie' -) -defaultAlpineVersion='3.6' -declare -A alpineVersions=( - [5.6]='3.4' - [7.0]='3.4' - [7.1]='3.4' -) - cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" versions=( "$@" ) @@ -131,55 +118,46 @@ for version in "${versions[@]}"; do dockerfiles=() - { generated_warning; cat Dockerfile-debian.template; } > "$version/Dockerfile" - cp -v \ - docker-php-entrypoint \ - docker-php-ext-* \ - docker-php-source \ - "$version/" - dockerfiles+=( "$version/Dockerfile" ) - - if [ -d "$version/alpine" ]; then - { generated_warning; cat Dockerfile-alpine.template; } > "$version/alpine/Dockerfile" - cp -v \ - docker-php-entrypoint \ - docker-php-ext-* \ - docker-php-source \ - "$version/alpine/" - dockerfiles+=( "$version/alpine/Dockerfile" ) - fi + for suite in alpine3.4 alpine3.6 jessie stretch-slim; do + [ -d "$version/$suite" ] || continue + alpineVer="${suite#alpine}" - for target in \ - apache \ - fpm fpm/alpine \ - zts zts/alpine \ - ; do - [ -d "$version/$target" ] || continue - base="$version/Dockerfile" - variant="${target%%/*}" - if [ "$target" != "$variant" ]; then - variantVariant="${target#$variant/}" - [ -d "$version/$variantVariant" ] || continue - base="$version/$variantVariant/Dockerfile" + baseDockerfile=Dockerfile-debian.template + if [ "${suite#alpine}" != "$suite" ]; then + baseDockerfile=Dockerfile-alpine.template fi - echo "Generating $version/$target/Dockerfile from $base + $variant-Dockerfile-block-*" - awk ' - $1 == "####" { ia = 0 } - !ia { print } - $1 == "####" { ia = 1; ab++; ac = 0 } - ia { ac++ } - ia && ac == 1 { system("cat '$variant'-Dockerfile-block-" ab) } - ' "$base" > "$version/$target/Dockerfile" - cp -v \ - docker-php-entrypoint \ - docker-php-ext-* \ - docker-php-source \ - "$version/$target/" - dockerfiles+=( "$version/$target/Dockerfile" ) - done - debianSuite="${debianSuites[$rcVersion]:-$defaultDebianSuite}" - alpineVersion="${alpineVersions[$rcVersion]:-$defaultAlpineVersion}" + for variant in apache cli fpm zts; do + [ -d "$version/$suite/$variant" ] || continue + { generated_warning; cat "$baseDockerfile"; } > "$version/$suite/$variant/Dockerfile" + if [ -f "$variant-Dockerfile-block-1" ]; then + echo "Generating $version/$suite/$variant/Dockerfile from $baseDockerfile + $variant-Dockerfile-block-*" + gawk -i inplace ' + $1 == "####" { ia = 0 } + !ia { print } + $1 == "####" { ia = 1; ab++; ac = 0 } + ia { ac++ } + ia && ac == 1 { system("cat '$variant'-Dockerfile-block-" ab) } + ' "$version/$suite/$variant/Dockerfile" + fi + + cp \ + docker-php-entrypoint \ + docker-php-ext-* \ + docker-php-source \ + "$version/$suite/$variant/" + + if [ "$alpineVer" = '3.4' ]; then + sed -ri 's!libressl!openssl!g' "$version/$suite/$variant/Dockerfile" + fi + + sed -ri \ + -e 's!%%DEBIAN_SUITE%%!'"$suite"'!' \ + -e 's!%%ALPINE_VERSION%%!'"$alpineVer"'!' \ + "$version/$suite/$variant/Dockerfile" + dockerfiles+=( "$version/$suite/$variant/Dockerfile" ) + done + done ( set -x @@ -190,15 +168,9 @@ for version in "${versions[@]}"; do -e 's!%%PHP_ASC_URL%%!'"$ascUrl"'!' \ -e 's!%%PHP_SHA256%%!'"$sha256"'!' \ -e 's!%%PHP_MD5%%!'"$md5"'!' \ - -e 's!%%DEBIAN_SUITE%%!'"$debianSuite"'!' \ - -e 's!%%ALPINE_VERSION%%!'"$alpineVersion"'!' \ "${dockerfiles[@]}" ) - if [ "$alpineVersion" = '3.4' ]; then - sed -ri 's!libressl!openssl!g' "${dockerfiles[@]}" - fi - # update entrypoint commands for dockerfile in "${dockerfiles[@]}"; do cmd="$(awk '$1 == "CMD" { $1 = ""; print }' "$dockerfile" | tail -1 | jq --raw-output '.[0]')" From 42a6a75b48c15dcb18cf3e6c342562dd78a78546 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 11 Oct 2017 15:44:38 -0700 Subject: [PATCH 2/4] Update generate-stackbrew to tag alpine version or debian suite --- generate-stackbrew-library.sh | 102 +++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 38 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 31adb3a7ee..70eacb6836 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,6 +1,19 @@ #!/bin/bash set -eu +defaultDebianSuite='stretch-slim' +declare -A debianSuite=( + [5.6]='jessie' + [7.0]='jessie' + [7.1]='jessie' +) +defaultAlpineVersion='3.6' +declare -A alpineVersion=( + [5.6]='3.4' + [7.0]='3.4' + [7.1]='3.4' +) + declare -A aliases=( [5.6]='5' [7.1]='7 latest' @@ -70,50 +83,63 @@ join() { } for version in "${versions[@]}"; do - commit="$(dirCommit "$version")" - - fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "ENV" && $2 == "PHP_VERSION" { print $3; exit }')" versionAliases=( - $fullVersion $version ${aliases[$version]:-} ) - for variant in \ - '' \ - alpine \ - apache \ - fpm fpm/alpine \ - zts zts/alpine \ + # order here controls the order of the library/ file + for suite in \ + stretch-slim \ + jessie \ + alpine3.6 \ + alpine3.4 \ ; do - dir="$version${variant:+/$variant}" - [ -f "$dir/Dockerfile" ] || continue - variant="${variant:-cli}" - - commit="$(dirCommit "$dir")" - - slash='/' - variantAliases=( "${versionAliases[@]/%/-${variant//$slash/-}}" ) - variantAliases=( "${variantAliases[@]//latest-/}" ) - if [ "$variant" = 'cli' ]; then - variantAliases+=( "${versionAliases[@]}" ) - fi - - variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")" - variantArches="${parentRepoToArches[$variantParent]}" - - # 7.2 no longer supports s390x - if [[ "$version" = 7.* ]] && [ "$version" != '7.0' ] && [ "$version" != '7.1' ]; then - variantArches="$(echo " $variantArches " | sed -r -e 's/ s390x//g')" - fi - - echo - cat <<-EOE - Tags: $(join ', ' "${variantAliases[@]}") - Architectures: $(join ', ' $variantArches) - GitCommit: $commit - Directory: $dir - EOE + for variant in \ + cli \ + apache \ + fpm \ + zts \ + ; do + dir="$version/$suite/$variant" + [ -f "$dir/Dockerfile" ] || continue + + commit="$(dirCommit "$dir")" + versionSuite="${debianSuite[$version]:-$defaultDebianSuite}" + fullVersion="$(git show "$commit":"$dir/Dockerfile" | awk '$1 == "ENV" && $2 == "PHP_VERSION" { print $3; exit }')" + + baseAliases=( $fullVersion "${versionAliases[@]}" ) + variantAliases=( "${baseAliases[@]/%/-$variant}" ) + variantAliases=( "${variantAliases[@]//latest-/}" ) + + if [ "$variant" = 'cli' ]; then + variantAliases+=( "${baseAliases[@]}" ) + fi + if [ "$suite" = "$versionSuite" ]; then + variantAliases=( "${variantAliases[@]/%/-${suite%-slim}}" "${variantAliases[@]}" ) + elif [ "${suite#alpine}" = "${alpineVersion[$version]:-$defaultAlpineVersion}" ] ; then + variantAliases=( "${variantAliases[@]/%/-$suite}" "${variantAliases[@]/%/-alpine}" ) + variantAliases=( "${variantAliases[@]//latest-/}" ) + else + variantAliases=( "${variantAliases[@]/%/-$suite}" ) + fi + + variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")" + variantArches="${parentRepoToArches[$variantParent]}" + + # 7.2 no longer supports s390x + if [[ "$version" = 7.* ]] && [ "$version" != '7.0' ] && [ "$version" != '7.1' ]; then + variantArches="$(echo " $variantArches " | sed -r -e 's/ s390x//g')" + fi + + echo + cat <<-EOE + Tags: $(join ', ' "${variantAliases[@]}") + Architectures: $(join ', ' $variantArches) + GitCommit: $commit + Directory: $dir + EOE + done done done From 58db00b3d0a5b3a5ded332b7cf871295b0682792 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 11 Oct 2017 16:06:34 -0700 Subject: [PATCH 3/4] Prevent `latest-jessie` tag --- generate-stackbrew-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 70eacb6836..c65db2c638 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -120,10 +120,10 @@ for version in "${versions[@]}"; do variantAliases=( "${variantAliases[@]/%/-${suite%-slim}}" "${variantAliases[@]}" ) elif [ "${suite#alpine}" = "${alpineVersion[$version]:-$defaultAlpineVersion}" ] ; then variantAliases=( "${variantAliases[@]/%/-$suite}" "${variantAliases[@]/%/-alpine}" ) - variantAliases=( "${variantAliases[@]//latest-/}" ) else variantAliases=( "${variantAliases[@]/%/-$suite}" ) fi + variantAliases=( "${variantAliases[@]//latest-/}" ) variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")" variantArches="${parentRepoToArches[$variantParent]}" From 662067f7336bbf238fdffb3aeee4b084a0cf3de7 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 11 Oct 2017 16:36:32 -0700 Subject: [PATCH 4/4] Hide the slim from the folder; reflect order preference from generate to update and travis --- .travis.yml | 32 +++++++++---------- .../apache/Dockerfile | 0 .../apache/apache2-foreground | 0 .../apache/docker-php-entrypoint | 0 .../apache/docker-php-ext-configure | 0 .../apache/docker-php-ext-enable | 0 .../apache/docker-php-ext-install | 0 .../apache/docker-php-source | 0 .../{stretch-slim => stretch}/cli/Dockerfile | 0 .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 .../{stretch-slim => stretch}/fpm/Dockerfile | 0 .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 .../{stretch-slim => stretch}/zts/Dockerfile | 0 .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 generate-stackbrew-library.sh | 17 +++++----- update.sh | 8 +++-- 28 files changed, 30 insertions(+), 27 deletions(-) rename 7.2-rc/{stretch-slim => stretch}/apache/Dockerfile (100%) rename 7.2-rc/{stretch-slim => stretch}/apache/apache2-foreground (100%) rename 7.2-rc/{stretch-slim => stretch}/apache/docker-php-entrypoint (100%) rename 7.2-rc/{stretch-slim => stretch}/apache/docker-php-ext-configure (100%) rename 7.2-rc/{stretch-slim => stretch}/apache/docker-php-ext-enable (100%) rename 7.2-rc/{stretch-slim => stretch}/apache/docker-php-ext-install (100%) rename 7.2-rc/{stretch-slim => stretch}/apache/docker-php-source (100%) rename 7.2-rc/{stretch-slim => stretch}/cli/Dockerfile (100%) rename 7.2-rc/{stretch-slim => stretch}/cli/docker-php-entrypoint (100%) rename 7.2-rc/{stretch-slim => stretch}/cli/docker-php-ext-configure (100%) rename 7.2-rc/{stretch-slim => stretch}/cli/docker-php-ext-enable (100%) rename 7.2-rc/{stretch-slim => stretch}/cli/docker-php-ext-install (100%) rename 7.2-rc/{stretch-slim => stretch}/cli/docker-php-source (100%) rename 7.2-rc/{stretch-slim => stretch}/fpm/Dockerfile (100%) rename 7.2-rc/{stretch-slim => stretch}/fpm/docker-php-entrypoint (100%) rename 7.2-rc/{stretch-slim => stretch}/fpm/docker-php-ext-configure (100%) rename 7.2-rc/{stretch-slim => stretch}/fpm/docker-php-ext-enable (100%) rename 7.2-rc/{stretch-slim => stretch}/fpm/docker-php-ext-install (100%) rename 7.2-rc/{stretch-slim => stretch}/fpm/docker-php-source (100%) rename 7.2-rc/{stretch-slim => stretch}/zts/Dockerfile (100%) rename 7.2-rc/{stretch-slim => stretch}/zts/docker-php-entrypoint (100%) rename 7.2-rc/{stretch-slim => stretch}/zts/docker-php-ext-configure (100%) rename 7.2-rc/{stretch-slim => stretch}/zts/docker-php-ext-enable (100%) rename 7.2-rc/{stretch-slim => stretch}/zts/docker-php-ext-install (100%) rename 7.2-rc/{stretch-slim => stretch}/zts/docker-php-source (100%) diff --git a/.travis.yml b/.travis.yml index 987a71e9a7..07488b40bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,34 +2,34 @@ language: bash services: docker env: + - VERSION=7.2-rc VARIANT=stretch/cli + - VERSION=7.2-rc VARIANT=stretch/apache + - VERSION=7.2-rc VARIANT=stretch/fpm + - VERSION=7.2-rc VARIANT=stretch/zts - VERSION=7.2-rc VARIANT=alpine3.6/cli - VERSION=7.2-rc VARIANT=alpine3.6/fpm - VERSION=7.2-rc VARIANT=alpine3.6/zts - - VERSION=7.2-rc VARIANT=stretch-slim/apache - - VERSION=7.2-rc VARIANT=stretch-slim/cli - - VERSION=7.2-rc VARIANT=stretch-slim/fpm - - VERSION=7.2-rc VARIANT=stretch-slim/zts - - VERSION=7.1 VARIANT=alpine3.4/cli - - VERSION=7.1 VARIANT=alpine3.4/fpm - - VERSION=7.1 VARIANT=alpine3.4/zts - - VERSION=7.1 VARIANT=jessie/apache - VERSION=7.1 VARIANT=jessie/cli + - VERSION=7.1 VARIANT=jessie/apache - VERSION=7.1 VARIANT=jessie/fpm - VERSION=7.1 VARIANT=jessie/zts - - VERSION=7.0 VARIANT=alpine3.4/cli - - VERSION=7.0 VARIANT=alpine3.4/fpm - - VERSION=7.0 VARIANT=alpine3.4/zts - - VERSION=7.0 VARIANT=jessie/apache + - VERSION=7.1 VARIANT=alpine3.4/cli + - VERSION=7.1 VARIANT=alpine3.4/fpm + - VERSION=7.1 VARIANT=alpine3.4/zts - VERSION=7.0 VARIANT=jessie/cli + - VERSION=7.0 VARIANT=jessie/apache - VERSION=7.0 VARIANT=jessie/fpm - VERSION=7.0 VARIANT=jessie/zts - - VERSION=5.6 VARIANT=alpine3.4/cli - - VERSION=5.6 VARIANT=alpine3.4/fpm - - VERSION=5.6 VARIANT=alpine3.4/zts - - VERSION=5.6 VARIANT=jessie/apache + - VERSION=7.0 VARIANT=alpine3.4/cli + - VERSION=7.0 VARIANT=alpine3.4/fpm + - VERSION=7.0 VARIANT=alpine3.4/zts - VERSION=5.6 VARIANT=jessie/cli + - VERSION=5.6 VARIANT=jessie/apache - VERSION=5.6 VARIANT=jessie/fpm - VERSION=5.6 VARIANT=jessie/zts + - VERSION=5.6 VARIANT=alpine3.4/cli + - VERSION=5.6 VARIANT=alpine3.4/fpm + - VERSION=5.6 VARIANT=alpine3.4/zts install: - git clone https://github.com/docker-library/official-images.git ~/official-images diff --git a/7.2-rc/stretch-slim/apache/Dockerfile b/7.2-rc/stretch/apache/Dockerfile similarity index 100% rename from 7.2-rc/stretch-slim/apache/Dockerfile rename to 7.2-rc/stretch/apache/Dockerfile diff --git a/7.2-rc/stretch-slim/apache/apache2-foreground b/7.2-rc/stretch/apache/apache2-foreground similarity index 100% rename from 7.2-rc/stretch-slim/apache/apache2-foreground rename to 7.2-rc/stretch/apache/apache2-foreground diff --git a/7.2-rc/stretch-slim/apache/docker-php-entrypoint b/7.2-rc/stretch/apache/docker-php-entrypoint similarity index 100% rename from 7.2-rc/stretch-slim/apache/docker-php-entrypoint rename to 7.2-rc/stretch/apache/docker-php-entrypoint diff --git a/7.2-rc/stretch-slim/apache/docker-php-ext-configure b/7.2-rc/stretch/apache/docker-php-ext-configure similarity index 100% rename from 7.2-rc/stretch-slim/apache/docker-php-ext-configure rename to 7.2-rc/stretch/apache/docker-php-ext-configure diff --git a/7.2-rc/stretch-slim/apache/docker-php-ext-enable b/7.2-rc/stretch/apache/docker-php-ext-enable similarity index 100% rename from 7.2-rc/stretch-slim/apache/docker-php-ext-enable rename to 7.2-rc/stretch/apache/docker-php-ext-enable diff --git a/7.2-rc/stretch-slim/apache/docker-php-ext-install b/7.2-rc/stretch/apache/docker-php-ext-install similarity index 100% rename from 7.2-rc/stretch-slim/apache/docker-php-ext-install rename to 7.2-rc/stretch/apache/docker-php-ext-install diff --git a/7.2-rc/stretch-slim/apache/docker-php-source b/7.2-rc/stretch/apache/docker-php-source similarity index 100% rename from 7.2-rc/stretch-slim/apache/docker-php-source rename to 7.2-rc/stretch/apache/docker-php-source diff --git a/7.2-rc/stretch-slim/cli/Dockerfile b/7.2-rc/stretch/cli/Dockerfile similarity index 100% rename from 7.2-rc/stretch-slim/cli/Dockerfile rename to 7.2-rc/stretch/cli/Dockerfile diff --git a/7.2-rc/stretch-slim/cli/docker-php-entrypoint b/7.2-rc/stretch/cli/docker-php-entrypoint similarity index 100% rename from 7.2-rc/stretch-slim/cli/docker-php-entrypoint rename to 7.2-rc/stretch/cli/docker-php-entrypoint diff --git a/7.2-rc/stretch-slim/cli/docker-php-ext-configure b/7.2-rc/stretch/cli/docker-php-ext-configure similarity index 100% rename from 7.2-rc/stretch-slim/cli/docker-php-ext-configure rename to 7.2-rc/stretch/cli/docker-php-ext-configure diff --git a/7.2-rc/stretch-slim/cli/docker-php-ext-enable b/7.2-rc/stretch/cli/docker-php-ext-enable similarity index 100% rename from 7.2-rc/stretch-slim/cli/docker-php-ext-enable rename to 7.2-rc/stretch/cli/docker-php-ext-enable diff --git a/7.2-rc/stretch-slim/cli/docker-php-ext-install b/7.2-rc/stretch/cli/docker-php-ext-install similarity index 100% rename from 7.2-rc/stretch-slim/cli/docker-php-ext-install rename to 7.2-rc/stretch/cli/docker-php-ext-install diff --git a/7.2-rc/stretch-slim/cli/docker-php-source b/7.2-rc/stretch/cli/docker-php-source similarity index 100% rename from 7.2-rc/stretch-slim/cli/docker-php-source rename to 7.2-rc/stretch/cli/docker-php-source diff --git a/7.2-rc/stretch-slim/fpm/Dockerfile b/7.2-rc/stretch/fpm/Dockerfile similarity index 100% rename from 7.2-rc/stretch-slim/fpm/Dockerfile rename to 7.2-rc/stretch/fpm/Dockerfile diff --git a/7.2-rc/stretch-slim/fpm/docker-php-entrypoint b/7.2-rc/stretch/fpm/docker-php-entrypoint similarity index 100% rename from 7.2-rc/stretch-slim/fpm/docker-php-entrypoint rename to 7.2-rc/stretch/fpm/docker-php-entrypoint diff --git a/7.2-rc/stretch-slim/fpm/docker-php-ext-configure b/7.2-rc/stretch/fpm/docker-php-ext-configure similarity index 100% rename from 7.2-rc/stretch-slim/fpm/docker-php-ext-configure rename to 7.2-rc/stretch/fpm/docker-php-ext-configure diff --git a/7.2-rc/stretch-slim/fpm/docker-php-ext-enable b/7.2-rc/stretch/fpm/docker-php-ext-enable similarity index 100% rename from 7.2-rc/stretch-slim/fpm/docker-php-ext-enable rename to 7.2-rc/stretch/fpm/docker-php-ext-enable diff --git a/7.2-rc/stretch-slim/fpm/docker-php-ext-install b/7.2-rc/stretch/fpm/docker-php-ext-install similarity index 100% rename from 7.2-rc/stretch-slim/fpm/docker-php-ext-install rename to 7.2-rc/stretch/fpm/docker-php-ext-install diff --git a/7.2-rc/stretch-slim/fpm/docker-php-source b/7.2-rc/stretch/fpm/docker-php-source similarity index 100% rename from 7.2-rc/stretch-slim/fpm/docker-php-source rename to 7.2-rc/stretch/fpm/docker-php-source diff --git a/7.2-rc/stretch-slim/zts/Dockerfile b/7.2-rc/stretch/zts/Dockerfile similarity index 100% rename from 7.2-rc/stretch-slim/zts/Dockerfile rename to 7.2-rc/stretch/zts/Dockerfile diff --git a/7.2-rc/stretch-slim/zts/docker-php-entrypoint b/7.2-rc/stretch/zts/docker-php-entrypoint similarity index 100% rename from 7.2-rc/stretch-slim/zts/docker-php-entrypoint rename to 7.2-rc/stretch/zts/docker-php-entrypoint diff --git a/7.2-rc/stretch-slim/zts/docker-php-ext-configure b/7.2-rc/stretch/zts/docker-php-ext-configure similarity index 100% rename from 7.2-rc/stretch-slim/zts/docker-php-ext-configure rename to 7.2-rc/stretch/zts/docker-php-ext-configure diff --git a/7.2-rc/stretch-slim/zts/docker-php-ext-enable b/7.2-rc/stretch/zts/docker-php-ext-enable similarity index 100% rename from 7.2-rc/stretch-slim/zts/docker-php-ext-enable rename to 7.2-rc/stretch/zts/docker-php-ext-enable diff --git a/7.2-rc/stretch-slim/zts/docker-php-ext-install b/7.2-rc/stretch/zts/docker-php-ext-install similarity index 100% rename from 7.2-rc/stretch-slim/zts/docker-php-ext-install rename to 7.2-rc/stretch/zts/docker-php-ext-install diff --git a/7.2-rc/stretch-slim/zts/docker-php-source b/7.2-rc/stretch/zts/docker-php-source similarity index 100% rename from 7.2-rc/stretch-slim/zts/docker-php-source rename to 7.2-rc/stretch/zts/docker-php-source diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index c65db2c638..860cbf9e4d 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eu -defaultDebianSuite='stretch-slim' +defaultDebianSuite='stretch' declare -A debianSuite=( [5.6]='jessie' [7.0]='jessie' @@ -91,7 +91,7 @@ for version in "${versions[@]}"; do # order here controls the order of the library/ file for suite in \ - stretch-slim \ + stretch \ jessie \ alpine3.6 \ alpine3.4 \ @@ -116,13 +116,14 @@ for version in "${versions[@]}"; do if [ "$variant" = 'cli' ]; then variantAliases+=( "${baseAliases[@]}" ) fi - if [ "$suite" = "$versionSuite" ]; then - variantAliases=( "${variantAliases[@]/%/-${suite%-slim}}" "${variantAliases[@]}" ) - elif [ "${suite#alpine}" = "${alpineVersion[$version]:-$defaultAlpineVersion}" ] ; then - variantAliases=( "${variantAliases[@]/%/-$suite}" "${variantAliases[@]/%/-alpine}" ) - else - variantAliases=( "${variantAliases[@]/%/-$suite}" ) + + suiteVariantAliases=( "${variantAliases[@]/%/-$suite}" ) + if [ "${suite#alpine}" = "${alpineVersion[$version]:-$defaultAlpineVersion}" ] ; then + variantAliases=( "${variantAliases[@]/%/-alpine}" ) + elif [ "$suite" != "$versionSuite" ]; then + variantAliases=() fi + variantAliases=( "${suiteVariantAliases[@]}" "${variantAliases[@]}" ) variantAliases=( "${variantAliases[@]//latest-/}" ) variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")" diff --git a/update.sh b/update.sh index 0bdfb88033..cc5233f118 100755 --- a/update.sh +++ b/update.sh @@ -118,7 +118,7 @@ for version in "${versions[@]}"; do dockerfiles=() - for suite in alpine3.4 alpine3.6 jessie stretch-slim; do + for suite in stretch jessie alpine3.6 alpine3.4; do [ -d "$version/$suite" ] || continue alpineVer="${suite#alpine}" @@ -127,7 +127,7 @@ for version in "${versions[@]}"; do baseDockerfile=Dockerfile-alpine.template fi - for variant in apache cli fpm zts; do + for variant in cli apache fpm zts; do [ -d "$version/$suite/$variant" ] || continue { generated_warning; cat "$baseDockerfile"; } > "$version/$suite/$variant/Dockerfile" if [ -f "$variant-Dockerfile-block-1" ]; then @@ -151,8 +151,10 @@ for version in "${versions[@]}"; do sed -ri 's!libressl!openssl!g' "$version/$suite/$variant/Dockerfile" fi + # automatic `-slim` for stretch + # TODO always add slim once jessie is removed sed -ri \ - -e 's!%%DEBIAN_SUITE%%!'"$suite"'!' \ + -e 's!%%DEBIAN_SUITE%%!'"${suite/stretch/stretch-slim}"'!' \ -e 's!%%ALPINE_VERSION%%!'"$alpineVer"'!' \ "$version/$suite/$variant/Dockerfile" dockerfiles+=( "$version/$suite/$variant/Dockerfile" )