From 3c8f5c9998d1e77984321581c5df81621af4a581 Mon Sep 17 00:00:00 2001
From: Andrea Giannantonio <a.giannantonio@gmail.com>
Date: Sun, 3 Jan 2021 10:56:16 +0100
Subject: [PATCH] feat(docker): improvment split docker images

---
 .circleci/config.yml                                |  4 ++--
 {.circleci/images => .docker/base}/php74/Dockerfile |  2 --
 {.circleci/images => .docker/base}/php80/Dockerfile |  2 --
 .docker/circleci/php74/Dockerfile                   |  3 +++
 .docker/circleci/php80/Dockerfile                   |  3 +++
 {docker => .docker/development}/php74/Dockerfile    |  0
 {docker => .docker/development}/php80/Dockerfile    |  0
 composer.json                                       | 10 +++++++---
 docker-compose.yml                                  |  4 ++--
 9 files changed, 17 insertions(+), 11 deletions(-)
 rename {.circleci/images => .docker/base}/php74/Dockerfile (97%)
 rename {.circleci/images => .docker/base}/php80/Dockerfile (97%)
 create mode 100644 .docker/circleci/php74/Dockerfile
 create mode 100644 .docker/circleci/php80/Dockerfile
 rename {docker => .docker/development}/php74/Dockerfile (100%)
 rename {docker => .docker/development}/php80/Dockerfile (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a7dbc91..59943e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,12 +4,12 @@ executors:
   # declares a reusable executor
   poser_executor_php74:
     docker:
-      - image: pugx/poser:php74
+      - image: pugx/poser:php74-circleci
     working_directory: ~/app
 
   poser_executor_php80:
     docker:
-      - image: pugx/poser:php80
+      - image: pugx/poser:php80-circleci
     working_directory: ~/app
 
 jobs:
diff --git a/.circleci/images/php74/Dockerfile b/.docker/base/php74/Dockerfile
similarity index 97%
rename from .circleci/images/php74/Dockerfile
rename to .docker/base/php74/Dockerfile
index f91babd..a80b566 100644
--- a/.circleci/images/php74/Dockerfile
+++ b/.docker/base/php74/Dockerfile
@@ -14,6 +14,4 @@ RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/i
 # install php requirements
 RUN docker-php-ext-install zip iconv gd
 
-USER circleci
-
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
diff --git a/.circleci/images/php80/Dockerfile b/.docker/base/php80/Dockerfile
similarity index 97%
rename from .circleci/images/php80/Dockerfile
rename to .docker/base/php80/Dockerfile
index 5c27928..692d520 100644
--- a/.circleci/images/php80/Dockerfile
+++ b/.docker/base/php80/Dockerfile
@@ -14,6 +14,4 @@ RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/i
 # install php requirements
 RUN docker-php-ext-install zip iconv gd
 
-USER circleci
-
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
diff --git a/.docker/circleci/php74/Dockerfile b/.docker/circleci/php74/Dockerfile
new file mode 100644
index 0000000..1a60695
--- /dev/null
+++ b/.docker/circleci/php74/Dockerfile
@@ -0,0 +1,3 @@
+FROM pugx/poser:php74
+
+USER circleci
diff --git a/.docker/circleci/php80/Dockerfile b/.docker/circleci/php80/Dockerfile
new file mode 100644
index 0000000..b3d0804
--- /dev/null
+++ b/.docker/circleci/php80/Dockerfile
@@ -0,0 +1,3 @@
+FROM pugx/poser:php80
+
+USER circleci
diff --git a/docker/php74/Dockerfile b/.docker/development/php74/Dockerfile
similarity index 100%
rename from docker/php74/Dockerfile
rename to .docker/development/php74/Dockerfile
diff --git a/docker/php80/Dockerfile b/.docker/development/php80/Dockerfile
similarity index 100%
rename from docker/php80/Dockerfile
rename to .docker/development/php80/Dockerfile
diff --git a/composer.json b/composer.json
index f88e228..4d06d01 100644
--- a/composer.json
+++ b/composer.json
@@ -56,10 +56,14 @@
         "phpspec": "bin/phpspec run --format=pretty --ansi",
         "phpspec-coverage": "bin/phpspec run -f progress -c phpspec-coverage.yml --ansi",
         "behat": "bin/behat",
-        "docker:build:php74": "docker build -t pugx/poser:php74 -f .circleci/images/php74/Dockerfile .",
+        "docker:build:php74": "docker build -t pugx/poser:php74 -f .docker/base/php74/Dockerfile .",
         "docker:push:php74": "docker push pugx/poser:php74",
-        "docker:build:php80": "docker build -t pugx/poser:php80 -f .circleci/images/php80/Dockerfile .",
-        "docker:push:php80": "docker push pugx/poser:php80"
+        "docker:build:php80": "docker build -t pugx/poser:php80 -f .docker/base/php80/Dockerfile .",
+        "docker:push:php80": "docker push pugx/poser:php80",
+        "docker:build:php74-circleci": "docker build -t pugx/poser:php74-circleci -f .docker/circleci/php74/Dockerfile .",
+        "docker:push:php74-circleci": "docker push pugx/poser:php74-circleci",
+        "docker:build:php80-circleci": "docker build -t pugx/poser:php80-circleci -f .docker/circleci/php80/Dockerfile .",
+        "docker:push:php80-circleci": "docker push pugx/poser:php80-circleci"
     },
     "extra": {
         "branch-alias": {
diff --git a/docker-compose.yml b/docker-compose.yml
index 065859e..561127d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
 
   php74:
     build:
-      context: docker/php74
+      context: .docker/development/php74
     working_dir: /application
     stdin_open: true
     volumes:
@@ -11,7 +11,7 @@ services:
 
   php80:
     build:
-      context: docker/php80
+      context: .docker/development/php80
     working_dir: /application
     stdin_open: true
     volumes: