removed standalone fpm image

.gitlab-ci.yml

 stages:
-  - php-build
-  - php-test
-  - nginx-build
-  - nginx-test
-  - php-release
-  - nginx-release
+  - build
+  - test
+  - release
   - cleanup
 
 variables:
@@ -14,7 +11,6 @@ before_script:
   - export ISOLATION=buildpipeline${CI_PIPELINE_ID}
   - export COMPOSE_PROJECT_NAME=${ISOLATION}${CI_BUILD_NAME}
   - export PHP_BASE_IMAGE_VERSION=7.4
-  - export PHP_IMAGE_VERSION=$(git describe --always --dirty --tags)
   - export STACK_PHP_IMAGE=${PHP_IMAGE_NAME}:${PHP_IMAGE_VERSION}
   - export REGISTRY_PHP_IMAGE=${PHP_IMAGE_NAME}:${CI_BUILD_REF_NAME}
   - export REGISTRY_PHP_IMAGE_LATEST=${PHP_IMAGE_NAME}:latest
@@ -29,22 +25,18 @@ after_script:
   - export COMPOSE_PROJECT_NAME=${ISOLATION}${CI_BUILD_NAME}
   - docker-compose down -v
 
-build:php:
-  stage: php-build
-  script:
-    - docker-compose build --pull php
 
 test:php:
-  stage: php-test
+  stage: test
   script:
-    - export PHP_SERVICE=php
+    - export PHP_SERVICE=php-nginx
     - sh test/prod.sh
     - sh test/dev.sh
     - sh test/debug.sh
     - docker-compose run --rm php php /test/requirements.php
 
 test:php:allow-fail:
-  stage: php-test
+  stage: test
   script:
     - cd php
     - docker run --rm ${STACK_PHP_IMAGE} sh -c 'composer global update --dry-run; composer diagnose'
@@ -52,40 +44,21 @@ test:php:allow-fail:
   except:
     - tags
 
-release:php:latest:
-  stage: php-release
-  only:
-    - latest
-  script:
-    - docker login --username ${REGISTRY_USER} --password ${REGISTRY_PASS} ${REGISTRY_HOST}
-    - docker tag ${STACK_PHP_IMAGE} ${REGISTRY_PHP_IMAGE_LATEST}
-    - docker push ${REGISTRY_PHP_IMAGE_LATEST}
-    - docker logout ${REGISTRY_HOST}
-
-release:php:tags:
-  stage: php-release
-  only:
-    - tags
-  script:
-    - docker login --username ${REGISTRY_USER} --password ${REGISTRY_PASS} ${REGISTRY_HOST}
-    - docker tag ${STACK_PHP_IMAGE} ${REGISTRY_PHP_IMAGE}
-    - docker push ${REGISTRY_PHP_IMAGE}
-    - docker logout ${REGISTRY_HOST}
 
 build:php-nginx:
-  stage: nginx-build
+  stage: build
   script:
     - cd nginx
     # use locally built image
     - docker-compose build php-nginx
 
 test:php-nginx:
-  stage: nginx-test
+  stage: test
   script:
     - docker-compose run --rm php-nginx nginx -v
 
 release:nginx:latest:
-  stage: nginx-release
+  stage: release
   only:
     - latest
   script:
@@ -95,7 +68,7 @@ release:nginx:latest:
     - docker logout ${REGISTRY_HOST}
 
 release:nginx:tags:
-  stage: nginx-release
+  stage: release
   only:
     - tags
   script:

README.md

@@ -18,6 +18,7 @@ Changelog
 ### 8.x
 
 - using updated yii2 images, different system package installation
+- removed standalone `fpm` image
 
 ### 7.x
 

docker-compose.yml

 version: '2'
 services:
 
-  php:
-    build:
-      dockerfile: Dockerfile-fpm
-      context: 'php'
-      args:
-        - PHP_BASE_IMAGE_VERSION=${PHP_BASE_IMAGE_VERSION}
-    image: ${PHP_IMAGE_NAME}:${PHP_IMAGE_VERSION}
-    environment:
-      - GITHUB_API_TOKEN=${GITHUB_API_TOKEN}
-      - PHP_ENABLE_XDEBUG=${PHP_ENABLE_XDEBUG}
-    volumes:
-      - ./test:/test
   php-nginx:
     build:
       dockerfile: Dockerfile-fpm-nginx
       context: 'nginx'
       args:
-        - PHP_IMAGE_VERSION=${PHP_IMAGE_VERSION}
-    image: ${PHP_IMAGE_NAME}:${PHP_IMAGE_VERSION}-nginx
+        - PHP_BASE_IMAGE_VERSION=${PHP_BASE_IMAGE_VERSION}
+    image: ${PHP_IMAGE_NAME}:${PHP_BASE_IMAGE_VERSION}-nginx
     environment:
+      - GITHUB_API_TOKEN=${GITHUB_API_TOKEN}
       - PHP_ENABLE_XDEBUG=${PHP_ENABLE_XDEBUG}
     volumes:
+      - ./test:/test
       - ./test/app/web:/app/web
     ports:
       - 80

nginx/Dockerfile-fpm-nginx

-ARG PHP_IMAGE_VERSION
-FROM dmstr/php-yii2:${PHP_IMAGE_VERSION}
+# PHP Docker image for Yii 2.0 Framework runtime
+# ==============================================
 
-# Install nginx
-RUN apt-get update \
- && apt-get install -y --force-yes \
+ARG PHP_BASE_IMAGE_VERSION
+FROM yiisoftware/yii2-php:${PHP_BASE_IMAGE_VERSION}-fpm
+
+# Install system packages for PHP extensions recommended for Yii 2.0 Framework
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && \
+    apt-get -y install \
+        gnupg2 && \
+    apt-key update && \
+    apt-get update && \
+    apt-get -y install \
+            git \
+            nano \
+            npm \
+            default-mysql-client \
             nginx-full \
             cron \
             supervisor \
             procps \
         --no-install-recommends && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+        apt-get clean && \
+        rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Install less-compiler
+RUN npm -g install \
+        less \
+        lesshint \
+        uglify-js \
+        uglifycss
+
+# Install Yii framework bash autocompletion
+RUN curl -L https://raw.githubusercontent.com/yiisoft/yii2/master/contrib/completion/bash/yii \
+        -o /etc/bash_completion.d/yii
 
 # Add configuration files
 COPY image-files/ /
 
+# Add GITHUB_API_TOKEN support for composer
+RUN chmod 700 \
+        /usr/local/bin/docker-entrypoint.sh \
+        /usr/local/bin/docker-run.sh \
+        /usr/local/bin/composer
+
+WORKDIR /app
+
+# Startup script for FPM
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+
 # forward request and error logs to docker log collector
 RUN ln -sf /dev/stdout /var/log/nginx/access.log \
  && ln -sf /dev/stderr /var/log/nginx/error.log \

php/Dockerfile-fpm

-# PHP Docker image for Yii 2.0 Framework runtime
-# ==============================================
-
-ARG PHP_BASE_IMAGE_VERSION
-FROM yiisoftware/yii2-php:${PHP_BASE_IMAGE_VERSION}-fpm
-
-# Install system packages for PHP extensions recommended for Yii 2.0 Framework
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && \
-    apt-get -y install \
-        gnupg2 && \
-    apt-key update && \
-    apt-get update && \
-    apt-get -y install \
-            git \
-            nano \
-            npm \
-            default-mysql-client \
-        --no-install-recommends && \
-        apt-get clean && \
-        rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Install less-compiler
-RUN npm -g install \
-        less \
-        lesshint \
-        uglify-js \
-        uglifycss
-
-# Install Yii framework bash autocompletion
-RUN curl -L https://raw.githubusercontent.com/yiisoft/yii2/master/contrib/completion/bash/yii \
-        -o /etc/bash_completion.d/yii
-
-# Add configuration files
-COPY image-files/ /
-
-# Add GITHUB_API_TOKEN support for composer
-RUN chmod 700 \
-        /usr/local/bin/docker-entrypoint.sh \
-        /usr/local/bin/docker-run.sh \
-        /usr/local/bin/composer
-
-WORKDIR /app
-
-# Startup script for FPM
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-CMD ["docker-run.sh"]

test/debug.sh

 #!/usr/bin/env bash
 
-PHP_SERVICE=${PHP_SERVICE-php}
+PHP_SERVICE=${PHP_SERVICE-php-nginx}
 
 echo "Running one-off command with xdebug"
 PHP_ENABLE_XDEBUG=1 docker-compose run ${PHP_SERVICE} php -i | grep xdebug

test/dev.sh

 #!/usr/bin/env bash
 
-PHP_SERVICE=${PHP_SERVICE-php}
+PHP_SERVICE=${PHP_SERVICE-php-nginx}
 
 echo "Checking composer..."
 docker-compose run --rm ${PHP_SERVICE} composer --version || exit 1
@@ -14,4 +14,4 @@ docker-compose run --rm ${PHP_SERVICE} git --version || exit 1
 echo "Checking npm..."
 docker-compose run --rm ${PHP_SERVICE} npm --version || exit 1
 
-echo "Done."
+echo "Done."
\ No newline at end of file

test/prod.sh

 #!/usr/bin/env bash
 
-PHP_SERVICE=${PHP_SERVICE-php}
+PHP_SERVICE=${PHP_SERVICE-php-nginx}
 
 docker-compose run --rm ${PHP_SERVICE} php --version
 # this would match even if module is not loaded, eg. when commented out in opcache.ini