From d9f865e747e11f20c9714424bc5d1ca091ac7757 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Mon, 12 Feb 2018 17:31:49 -0600 Subject: [PATCH] Reorganize variants to group on PHP version then platform build --- {apache => php5.6/apache}/Dockerfile | 0 {apache-php7.0 => php5.6/apache}/docker-entrypoint.sh | 0 {apache-php7.0 => php5.6/apache}/makedb.php | 0 {fpm => php5.6/fpm}/Dockerfile | 0 {apache-php7.1 => php5.6/fpm}/docker-entrypoint.sh | 0 {apache-php7.1 => php5.6/fpm}/makedb.php | 0 {apache-php7.0 => php7.0/apache}/Dockerfile | 0 {apache-php7.2 => php7.0/apache}/docker-entrypoint.sh | 0 {apache-php7.2 => php7.0/apache}/makedb.php | 0 {fpm-php7.0 => php7.0/fpm}/Dockerfile | 0 {apache => php7.0/fpm}/docker-entrypoint.sh | 0 {apache => php7.0/fpm}/makedb.php | 0 {apache-php7.1 => php7.1/apache}/Dockerfile | 0 {fpm-php7.0 => php7.1/apache}/docker-entrypoint.sh | 0 {fpm-php7.0 => php7.1/apache}/makedb.php | 0 {fpm-php7.1 => php7.1/fpm}/Dockerfile | 0 {fpm-php7.1 => php7.1/fpm}/docker-entrypoint.sh | 0 {fpm-php7.1 => php7.1/fpm}/makedb.php | 0 {apache-php7.2 => php7.2/apache}/Dockerfile | 0 {fpm-php7.2 => php7.2/apache}/docker-entrypoint.sh | 0 {fpm-php7.2 => php7.2/apache}/makedb.php | 0 {fpm-php7.2 => php7.2/fpm}/Dockerfile | 0 {fpm => php7.2/fpm}/docker-entrypoint.sh | 0 {fpm => php7.2/fpm}/makedb.php | 0 24 files changed, 0 insertions(+), 0 deletions(-) rename {apache => php5.6/apache}/Dockerfile (100%) rename {apache-php7.0 => php5.6/apache}/docker-entrypoint.sh (100%) rename {apache-php7.0 => php5.6/apache}/makedb.php (100%) rename {fpm => php5.6/fpm}/Dockerfile (100%) rename {apache-php7.1 => php5.6/fpm}/docker-entrypoint.sh (100%) rename {apache-php7.1 => php5.6/fpm}/makedb.php (100%) rename {apache-php7.0 => php7.0/apache}/Dockerfile (100%) rename {apache-php7.2 => php7.0/apache}/docker-entrypoint.sh (100%) rename {apache-php7.2 => php7.0/apache}/makedb.php (100%) rename {fpm-php7.0 => php7.0/fpm}/Dockerfile (100%) rename {apache => php7.0/fpm}/docker-entrypoint.sh (100%) rename {apache => php7.0/fpm}/makedb.php (100%) rename {apache-php7.1 => php7.1/apache}/Dockerfile (100%) rename {fpm-php7.0 => php7.1/apache}/docker-entrypoint.sh (100%) rename {fpm-php7.0 => php7.1/apache}/makedb.php (100%) rename {fpm-php7.1 => php7.1/fpm}/Dockerfile (100%) rename {fpm-php7.1 => php7.1/fpm}/docker-entrypoint.sh (100%) rename {fpm-php7.1 => php7.1/fpm}/makedb.php (100%) rename {apache-php7.2 => php7.2/apache}/Dockerfile (100%) rename {fpm-php7.2 => php7.2/apache}/docker-entrypoint.sh (100%) rename {fpm-php7.2 => php7.2/apache}/makedb.php (100%) rename {fpm-php7.2 => php7.2/fpm}/Dockerfile (100%) rename {fpm => php7.2/fpm}/docker-entrypoint.sh (100%) rename {fpm => php7.2/fpm}/makedb.php (100%) diff --git a/apache/Dockerfile b/php5.6/apache/Dockerfile similarity index 100% rename from apache/Dockerfile rename to php5.6/apache/Dockerfile diff --git a/apache-php7.0/docker-entrypoint.sh b/php5.6/apache/docker-entrypoint.sh similarity index 100% rename from apache-php7.0/docker-entrypoint.sh rename to php5.6/apache/docker-entrypoint.sh diff --git a/apache-php7.0/makedb.php b/php5.6/apache/makedb.php similarity index 100% rename from apache-php7.0/makedb.php rename to php5.6/apache/makedb.php diff --git a/fpm/Dockerfile b/php5.6/fpm/Dockerfile similarity index 100% rename from fpm/Dockerfile rename to php5.6/fpm/Dockerfile diff --git a/apache-php7.1/docker-entrypoint.sh b/php5.6/fpm/docker-entrypoint.sh similarity index 100% rename from apache-php7.1/docker-entrypoint.sh rename to php5.6/fpm/docker-entrypoint.sh diff --git a/apache-php7.1/makedb.php b/php5.6/fpm/makedb.php similarity index 100% rename from apache-php7.1/makedb.php rename to php5.6/fpm/makedb.php diff --git a/apache-php7.0/Dockerfile b/php7.0/apache/Dockerfile similarity index 100% rename from apache-php7.0/Dockerfile rename to php7.0/apache/Dockerfile diff --git a/apache-php7.2/docker-entrypoint.sh b/php7.0/apache/docker-entrypoint.sh similarity index 100% rename from apache-php7.2/docker-entrypoint.sh rename to php7.0/apache/docker-entrypoint.sh diff --git a/apache-php7.2/makedb.php b/php7.0/apache/makedb.php similarity index 100% rename from apache-php7.2/makedb.php rename to php7.0/apache/makedb.php diff --git a/fpm-php7.0/Dockerfile b/php7.0/fpm/Dockerfile similarity index 100% rename from fpm-php7.0/Dockerfile rename to php7.0/fpm/Dockerfile diff --git a/apache/docker-entrypoint.sh b/php7.0/fpm/docker-entrypoint.sh similarity index 100% rename from apache/docker-entrypoint.sh rename to php7.0/fpm/docker-entrypoint.sh diff --git a/apache/makedb.php b/php7.0/fpm/makedb.php similarity index 100% rename from apache/makedb.php rename to php7.0/fpm/makedb.php diff --git a/apache-php7.1/Dockerfile b/php7.1/apache/Dockerfile similarity index 100% rename from apache-php7.1/Dockerfile rename to php7.1/apache/Dockerfile diff --git a/fpm-php7.0/docker-entrypoint.sh b/php7.1/apache/docker-entrypoint.sh similarity index 100% rename from fpm-php7.0/docker-entrypoint.sh rename to php7.1/apache/docker-entrypoint.sh diff --git a/fpm-php7.0/makedb.php b/php7.1/apache/makedb.php similarity index 100% rename from fpm-php7.0/makedb.php rename to php7.1/apache/makedb.php diff --git a/fpm-php7.1/Dockerfile b/php7.1/fpm/Dockerfile similarity index 100% rename from fpm-php7.1/Dockerfile rename to php7.1/fpm/Dockerfile diff --git a/fpm-php7.1/docker-entrypoint.sh b/php7.1/fpm/docker-entrypoint.sh similarity index 100% rename from fpm-php7.1/docker-entrypoint.sh rename to php7.1/fpm/docker-entrypoint.sh diff --git a/fpm-php7.1/makedb.php b/php7.1/fpm/makedb.php similarity index 100% rename from fpm-php7.1/makedb.php rename to php7.1/fpm/makedb.php diff --git a/apache-php7.2/Dockerfile b/php7.2/apache/Dockerfile similarity index 100% rename from apache-php7.2/Dockerfile rename to php7.2/apache/Dockerfile diff --git a/fpm-php7.2/docker-entrypoint.sh b/php7.2/apache/docker-entrypoint.sh similarity index 100% rename from fpm-php7.2/docker-entrypoint.sh rename to php7.2/apache/docker-entrypoint.sh diff --git a/fpm-php7.2/makedb.php b/php7.2/apache/makedb.php similarity index 100% rename from fpm-php7.2/makedb.php rename to php7.2/apache/makedb.php diff --git a/fpm-php7.2/Dockerfile b/php7.2/fpm/Dockerfile similarity index 100% rename from fpm-php7.2/Dockerfile rename to php7.2/fpm/Dockerfile diff --git a/fpm/docker-entrypoint.sh b/php7.2/fpm/docker-entrypoint.sh similarity index 100% rename from fpm/docker-entrypoint.sh rename to php7.2/fpm/docker-entrypoint.sh diff --git a/fpm/makedb.php b/php7.2/fpm/makedb.php similarity index 100% rename from fpm/makedb.php rename to php7.2/fpm/makedb.php