Dropping support for PHP 7.1

Author: moufmouf

.github/workflows/workflow.yml

@@ -3,12 +3,12 @@ name: Docker PHP Images GitHub workflow
 on:
   pull_request:
     branches:
-      - 'v4-dev'
+      - 'v4'
   push:
     branches:
-      - 'v4-dev'
-#  schedule:
-#    - cron: '0 0 * * 0'
+      - 'v4'
+  schedule:
+    - cron: '42 3 * * 0'
 
 jobs:
   build_test_maybe_release:
@@ -39,12 +39,6 @@ jobs:
             php_version: '7.2'
           - variant: 'fpm'
             php_version: '7.2'
-          - variant: 'cli'
-            php_version: '7.1'
-          - variant: 'apache'
-            php_version: '7.1'
-          - variant: 'fpm'
-            php_version: '7.1'
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
@@ -54,22 +48,29 @@ jobs:
       - uses: actions/checkout@v1
       - name: Build and test
         run: |
-          PHP_VERSION="${{ matrix.php_version }}" BRANCH="v4-dev" VARIANT="${{ matrix.variant }}" ./build-and-test.sh
+          PHP_VERSION="${{ matrix.php_version }}" BRANCH="v4" VARIANT="${{ matrix.variant }}" ./build-and-test.sh
           docker images | grep thecodingmachine/php
-#      - name: Login to DockerHub
-#        # Merge ~ push.
-#        if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
-#        uses: docker/login-action@v1
-#        with:
-#          username: ${{ secrets.DOCKERHUB_USERNAME }}
-#          password: ${{ secrets.DOCKERHUB_TOKEN }}
-#      - name: Release
-#        # Merge ~ push.
-#        if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
-#        run: |
-#          BRANCH_VARIANT=`echo "${{ matrix.variant }}" | sed 's/\./-/g'`
-#          docker push thecodingmachine/php:${{ matrix.php_version }}-v3-slim-${BRANCH_VARIANT}
-#          docker push thecodingmachine/php:${{ matrix.php_version }}-v3-${BRANCH_VARIANT}
-#          docker push thecodingmachine/php:${{ matrix.php_version }}-v3-${BRANCH_VARIANT}-node8
-#          docker push thecodingmachine/php:${{ matrix.php_version }}-v3-${BRANCH_VARIANT}-node10
-#          docker push thecodingmachine/php:${{ matrix.php_version }}-v3-${BRANCH_VARIANT}-node12
+      - name: Login to DockerHub
+        # Merge ~ push.
+        if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Release
+        # Merge ~ push.
+        if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
+        run: |
+          BRANCH_VARIANT=`echo "${{ matrix.variant }}" | sed 's/\./-/g'`
+          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-slim-${BRANCH_VARIANT}
+          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}
+          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node8
+          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node10
+          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node12
+          # Let's also tag PHP patch releases
+          PHP_PATCH_VERSION=`docker run --rm thecodingmachine/php:${{ matrix.php_version }}-v4-slim-${BRANCH_VARIANT} php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o`
+          docker push -t thecodingmachine/php:${PHP_PATCH_VERSION}-v4-slim-${BRANCH_VARIANT} thecodingmachine/php:${PHP_VERSION}-v4-slim-${BRANCH_VARIANT}
+          docker push -t thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT} thecodingmachine/php:${PHP_VERSION}-v4-${BRANCH_VARIANT}
+          docker push -t thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node10 thecodingmachine/php:${PHP_VERSION}-v4-${BRANCH_VARIANT}-node10
+          docker push -t thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node12 thecodingmachine/php:${PHP_VERSION}-v4-${BRANCH_VARIANT}-node12
+          docker push -t thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node14 thecodingmachine/php:${PHP_VERSION}-v4-${BRANCH_VARIANT}-node14

CHANGELOG.md

@@ -252,7 +252,7 @@ RUN ln -s /etc/php/${PHP_VERSION}/mods-available/generated_conf.ini /etc/php/${P
     sed -i 's/^group = www-data/;group = www-data/g' /etc/php/${PHP_VERSION}/fpm/pool.d/www.conf && \
     sed -i 's#listen = /run/php/php${PHP_VERSION}-fpm.sock#;listen = /run/php/php${PHP_VERSION}-fpm.sock#g' /etc/php/${PHP_VERSION}/fpm/pool.d/www.conf && \
     sed -i "s#pid = /run/php/php${PHP_VERSION}-fpm.pid#;pid = /run/php/php${PHP_VERSION}-fpm.pid#g" /etc/php/${PHP_VERSION}/fpm/php-fpm.conf && \
-    if [ "$PHP_VERSION" = "7.1" ] || [ "$PHP_VERSION" = "7.2" ]; then \
+    if [ "$PHP_VERSION" = "7.2" ]; then \
         sed -i 's/^log_limit =/;log_limit =/g' /etc/php/${PHP_VERSION}/fpm/pool.d/docker.conf && \
         sed -i 's/^decorate_workers_output =/;decorate_workers_output =/g' /etc/php/${PHP_VERSION}/fpm/pool.d/docker.conf; \
     fi