feat(docker): improvment split docker images

badges · Jan 3, 2021 · 3c8f5c9 · 3c8f5c9
1 parent c7a7e78
commit 3c8f5c9
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 11 deletions.
diff --git 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 → .docker/base/php74/Dockerfile b/.circleci/images/php74/Dockerfile → .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 → .docker/base/php80/Dockerfile b/.circleci/images/php80/Dockerfile → .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
@@ -0,0 +1,3 @@
+FROM pugx/poser:php74
+
+USER circleci
diff --git a/.docker/circleci/php80/Dockerfile b/.docker/circleci/php80/Dockerfile
@@ -0,0 +1,3 @@
+FROM pugx/poser:php80
+
+USER circleci
diff --git a/docker/php74/Dockerfile → .docker/development/php74/Dockerfile b/docker/php74/Dockerfile → .docker/development/php74/Dockerfile
diff --git a/docker/php80/Dockerfile → .docker/development/php80/Dockerfile b/docker/php80/Dockerfile → .docker/development/php80/Dockerfile
diff --git 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
@@ -3,15 +3,15 @@ services:
 
   php74:
     build:
-      context: docker/php74
+      context: .docker/development/php74
     working_dir: /application
     stdin_open: true
     volumes:
       - .:/application:cached
 
   php80:
     build:
-      context: docker/php80
+      context: .docker/development/php80
     working_dir: /application
     stdin_open: true
     volumes: