Merge pull request #184 from koromerzhin/develop

.github/workflows/ci.yml

@@ -34,12 +34,12 @@ jobs:
         uses: zoexx/github-action-json-file-properties@release
         with:
             file_path: "matrix.json"
-  php:
+  phpfpm:
     strategy:
       fail-fast: false
       matrix: 
         php: ${{ fromJson(needs.generatejobs.outputs.php) }}
-    name: PHP ${{ matrix.php.version }}
+    name: PHP FPM ${{ matrix.php.version }}
     needs: generatejobs
     runs-on: ubuntu-22.04
     steps:
@@ -49,15 +49,68 @@ jobs:
           submodules: recursive
       - name: Install npm dependencies
         timeout-minutes: 60
+        if: matrix.php.disable == 'off'
+        run: npm install
+      - name: "Generate file SH IF LAST"
+        timeout-minutes: 60
+        if: matrix.php.disable == 'off'
+        run: npm run docker:build:php --folder=${{ matrix.php.version }} --xdebug=${{ matrix.php.xdebug }} --latest=${{ matrix.php.latest }} --select=phpfpm
+      - name: "Build image PHP FPM"
+        timeout-minutes: 60
+        if: matrix.php.disable == 'off'
+        run: ./build-php-fpm-${{ matrix.php.version }}.sh
+      - name: "TAG image PHP FPM"
+        timeout-minutes: 60
+        if: matrix.php.disable == 'off'
+        run: ./tag-php-fpm-${{ matrix.php.version }}.sh
+      - name: "Show images"
+        timeout-minutes: 60
+        if: matrix.php.disable == 'off'
+        run: npm run docker:image:ls
+      - name: Set up QEMU
+        if: github.ref == 'refs/heads/main' && matrix.php.disable == 'off'
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        if: github.ref == 'refs/heads/main' && matrix.php.disable == 'off'
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        if: github.ref == 'refs/heads/main' && matrix.php.disable == 'off'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Push Docker
+        if: github.ref == 'refs/heads/main' && matrix.php.disable == 'off'
+        run: npm run docker:push:php
+  phpapache:
+    strategy:
+      fail-fast: false
+      matrix: 
+        php: ${{ fromJson(needs.generatejobs.outputs.php) }}
+    name: PHP APACHE ${{ matrix.php.version }}
+    needs: generatejobs
+    runs-on: ubuntu-22.04
+    steps:
+      - name: cdout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Install npm dependencies
+        timeout-minutes: 60
+        if: matrix.php.disable == 'off'
         run: npm install
       - name: "Generate file SH IF LAST"
+        if: matrix.php.disable == 'off'
+        timeout-minutes: 60
+        run: npm run docker:build:php --folder=${{ matrix.php.version }} --xdebug=${{ matrix.php.xdebug }} --latest=${{ matrix.php.latest }} --select=apache
+      - name: "Build image PHP APACHE"
         timeout-minutes: 60
         if: matrix.php.disable == 'off'
-        run: npm run docker:build:php --folder=${{ matrix.php.version }} --xdebug=${{ matrix.php.xdebug }} --latest=${{ matrix.php.latest }}
-      - name: "Build image"
+        run: ./build-php-apache-${{ matrix.php.version }}.sh
+      - name: "TAG image PHP APACHE"
         timeout-minutes: 60
         if: matrix.php.disable == 'off'
-        run: ./build-php-${{ matrix.php.version }}.sh
+        run: ./tag-php-apache-${{ matrix.php.version }}.sh
       - name: "Show images"
         timeout-minutes: 60
         if: matrix.php.disable == 'off'
@@ -78,3 +131,5 @@ jobs:
         if: github.ref == 'refs/heads/main' && matrix.php.disable == 'off'
         run: npm run docker:push:php
 
+
+

images/php-apache/5.6/Dockerfile

@@ -32,20 +32,33 @@ RUN install-php-extensions \
     tidy \
     zip
 
+WORKDIR /var/www
+
+EXPOSE 9000
+
+
+FROM build-php-apache AS build-php-apache-wordpress
 # Wordpress
 RUN wget https://github.com/wp-cli/wp-cli/releases/download/v2.9.0/wp-cli-2.9.0.phar -O wp-cli.phar && \
     chmod +x wp-cli.phar && \
     mv wp-cli.phar /usr/local/bin/wp
+
+
+FROM build-php-apache AS build-php-apache-symfony
 # Symfony
 RUN wget https://github.com/symfony-cli/symfony-cli/releases/download/v5.7.3/symfony-cli_5.7.3_amd64.deb -O symfony-cli_amd64.deb && \
     dpkg -i symfony-cli_amd64.deb && \
     rm symfony-cli_amd64.deb
+
 
-WORKDIR /var/www
+FROM build-php-apache AS build-php-apache-xdebug
 
-EXPOSE 9000
+RUN install-php-extensions xdebug
 
+FROM build-php-apache-wordpress AS build-php-apache-wordpress-xdebug
 
-FROM build-php-apache AS build-php-apache-xdebug
+RUN install-php-extensions xdebug
+
+FROM build-php-apache-symfony AS build-php-apache-symfony-xdebug
 
 RUN install-php-extensions xdebug

images/php-apache/7.4/Dockerfile

@@ -32,20 +32,33 @@ RUN install-php-extensions \
     tidy \
     zip
 
+WORKDIR /var/www
+
+EXPOSE 9000
+
+
+FROM build-php-apache AS build-php-apache-wordpress
 # Wordpress
 RUN wget https://github.com/wp-cli/wp-cli/releases/download/v2.9.0/wp-cli-2.9.0.phar -O wp-cli.phar && \
     chmod +x wp-cli.phar && \
     mv wp-cli.phar /usr/local/bin/wp
+
+
+FROM build-php-apache AS build-php-apache-symfony
 # Symfony
 RUN wget https://github.com/symfony-cli/symfony-cli/releases/download/v5.7.3/symfony-cli_5.7.3_amd64.deb -O symfony-cli_amd64.deb && \
     dpkg -i symfony-cli_amd64.deb && \
     rm symfony-cli_amd64.deb
+
 
-WORKDIR /var/www
+FROM build-php-apache AS build-php-apache-xdebug
 
-EXPOSE 9000
+RUN install-php-extensions xdebug
 
+FROM build-php-apache-wordpress AS build-php-apache-wordpress-xdebug
 
-FROM build-php-apache AS build-php-apache-xdebug
+RUN install-php-extensions xdebug
+
+FROM build-php-apache-symfony AS build-php-apache-symfony-xdebug
 
 RUN install-php-extensions xdebug

images/php-apache/8.0/Dockerfile

@@ -32,20 +32,32 @@ RUN install-php-extensions \
     tidy \
     zip
 
+WORKDIR /var/www
+
+EXPOSE 9000
+
+FROM build-php-apache AS build-php-apache-wordpress
 # Wordpress
 RUN wget https://github.com/wp-cli/wp-cli/releases/download/v2.9.0/wp-cli-2.9.0.phar -O wp-cli.phar && \
     chmod +x wp-cli.phar && \
     mv wp-cli.phar /usr/local/bin/wp
+
+
+FROM build-php-apache AS build-php-apache-symfony
 # Symfony
 RUN wget https://github.com/symfony-cli/symfony-cli/releases/download/v5.7.3/symfony-cli_5.7.3_amd64.deb -O symfony-cli_amd64.deb && \
     dpkg -i symfony-cli_amd64.deb && \
     rm symfony-cli_amd64.deb
+
 
-WORKDIR /var/www
+FROM build-php-apache AS build-php-apache-xdebug
 
-EXPOSE 9000
+RUN install-php-extensions xdebug
 
+FROM build-php-apache-wordpress AS build-php-apache-wordpress-xdebug
 
-FROM build-php-apache AS build-php-apache-xdebug
+RUN install-php-extensions xdebug
+
+FROM build-php-apache-symfony AS build-php-apache-symfony-xdebug
 
 RUN install-php-extensions xdebug

images/php-apache/8.1/Dockerfile

@@ -32,20 +32,32 @@ RUN install-php-extensions \
     tidy \
     zip
 
+WORKDIR /var/www
+
+EXPOSE 9000
+
+FROM build-php-apache AS build-php-apache-wordpress
 # Wordpress
 RUN wget https://github.com/wp-cli/wp-cli/releases/download/v2.9.0/wp-cli-2.9.0.phar -O wp-cli.phar && \
     chmod +x wp-cli.phar && \
     mv wp-cli.phar /usr/local/bin/wp
+
+
+FROM build-php-apache AS build-php-apache-symfony
 # Symfony
 RUN wget https://github.com/symfony-cli/symfony-cli/releases/download/v5.7.3/symfony-cli_5.7.3_amd64.deb -O symfony-cli_amd64.deb && \
     dpkg -i symfony-cli_amd64.deb && \
     rm symfony-cli_amd64.deb
+
 
-WORKDIR /var/www
+FROM build-php-apache AS build-php-apache-xdebug
 
-EXPOSE 9000
+RUN install-php-extensions xdebug
 
+FROM build-php-apache-wordpress AS build-php-apache-wordpress-xdebug
 
-FROM build-php-apache AS build-php-apache-xdebug
+RUN install-php-extensions xdebug
+
+FROM build-php-apache-symfony AS build-php-apache-symfony-xdebug
 
 RUN install-php-extensions xdebug

images/php-apache/8.2/Dockerfile

@@ -32,20 +32,32 @@ RUN install-php-extensions \
     tidy \
     zip
 
+WORKDIR /var/www
+
+EXPOSE 9000
+
+FROM build-php-apache AS build-php-apache-wordpress
 # Wordpress
 RUN wget https://github.com/wp-cli/wp-cli/releases/download/v2.9.0/wp-cli-2.9.0.phar -O wp-cli.phar && \
     chmod +x wp-cli.phar && \
     mv wp-cli.phar /usr/local/bin/wp
+
+
+FROM build-php-apache AS build-php-apache-symfony
 # Symfony
 RUN wget https://github.com/symfony-cli/symfony-cli/releases/download/v5.7.3/symfony-cli_5.7.3_amd64.deb -O symfony-cli_amd64.deb && \
     dpkg -i symfony-cli_amd64.deb && \
     rm symfony-cli_amd64.deb
+
 
-WORKDIR /var/www
+FROM build-php-apache AS build-php-apache-xdebug
 
-EXPOSE 9000
+RUN install-php-extensions xdebug
 
+FROM build-php-apache-wordpress AS build-php-apache-wordpress-xdebug
 
-FROM build-php-apache AS build-php-apache-xdebug
+RUN install-php-extensions xdebug
+
+FROM build-php-apache-symfony AS build-php-apache-symfony-xdebug
 
 RUN install-php-extensions xdebug

images/php-apache/8.3/Dockerfile

@@ -32,20 +32,32 @@ RUN install-php-extensions \
     tidy \
     zip
 
+WORKDIR /var/www
+
+EXPOSE 9000
+
+FROM build-php-apache AS build-php-apache-wordpress
 # Wordpress
 RUN wget https://github.com/wp-cli/wp-cli/releases/download/v2.9.0/wp-cli-2.9.0.phar -O wp-cli.phar && \
     chmod +x wp-cli.phar && \
     mv wp-cli.phar /usr/local/bin/wp
+
+
+FROM build-php-apache AS build-php-apache-symfony
 # Symfony
 RUN wget https://github.com/symfony-cli/symfony-cli/releases/download/v5.7.3/symfony-cli_5.7.3_amd64.deb -O symfony-cli_amd64.deb && \
     dpkg -i symfony-cli_amd64.deb && \
     rm symfony-cli_amd64.deb
+
 
-WORKDIR /var/www
+FROM build-php-apache AS build-php-apache-xdebug
 
-EXPOSE 9000
+RUN install-php-extensions xdebug
 
+FROM build-php-apache-wordpress AS build-php-apache-wordpress-xdebug
 
-FROM build-php-apache AS build-php-apache-xdebug
+RUN install-php-extensions xdebug
+
+FROM build-php-apache-symfony AS build-php-apache-symfony-xdebug
 
 RUN install-php-extensions xdebug

images/phpfpm/5.6/Dockerfile

@@ -32,18 +32,33 @@ RUN install-php-extensions \
     tidy \
     zip
 
+WORKDIR /var/www
+
+
+FROM build-phpfpm AS build-phpfpm-wordpress
 # Wordpress
 RUN wget https://github.com/wp-cli/wp-cli/releases/download/v2.9.0/wp-cli-2.9.0.phar -O wp-cli.phar && \
     chmod +x wp-cli.phar && \
     mv wp-cli.phar /usr/local/bin/wp
+
+
+FROM build-phpfpm AS build-phpfpm-symfony
 # Symfony
 RUN wget https://github.com/symfony-cli/symfony-cli/releases/download/v5.7.3/symfony-cli_5.7.3_amd64.deb -O symfony-cli_amd64.deb && \
     dpkg -i symfony-cli_amd64.deb && \
     rm symfony-cli_amd64.deb
 
-WORKDIR /var/www
-
 
 FROM build-phpfpm AS build-phpfpm-xdebug
 
 RUN install-php-extensions xdebug
+
+
+FROM build-phpfpm-wordpress AS build-phpfpm-wordpress-xdebug
+
+RUN install-php-extensions xdebug
+
+
+FROM build-phpfpm-symfony AS build-phpfpm-symfony-xdebug
+
+RUN install-php-extensions xdebug

images/phpfpm/7.4/Dockerfile

@@ -32,18 +32,33 @@ RUN install-php-extensions \
     tidy \
     zip
 
+WORKDIR /var/www
+
+
+FROM build-phpfpm AS build-phpfpm-wordpress
 # Wordpress
 RUN wget https://github.com/wp-cli/wp-cli/releases/download/v2.9.0/wp-cli-2.9.0.phar -O wp-cli.phar && \
     chmod +x wp-cli.phar && \
     mv wp-cli.phar /usr/local/bin/wp
+
+
+FROM build-phpfpm AS build-phpfpm-symfony
 # Symfony
 RUN wget https://github.com/symfony-cli/symfony-cli/releases/download/v5.7.3/symfony-cli_5.7.3_amd64.deb -O symfony-cli_amd64.deb && \
     dpkg -i symfony-cli_amd64.deb && \
     rm symfony-cli_amd64.deb
 
-WORKDIR /var/www
-
 
 FROM build-phpfpm AS build-phpfpm-xdebug
 
 RUN install-php-extensions xdebug
+
+
+FROM build-phpfpm-wordpress AS build-phpfpm-wordpress-xdebug
+
+RUN install-php-extensions xdebug
+
+
+FROM build-phpfpm-symfony AS build-phpfpm-symfony-xdebug
+
+RUN install-php-extensions xdebug