v2.1.8 (#33)

Minor updates
* Using latest base images

Build updates
* Moving conditional in auto workflows

Author: bfren

.github/workflows/auto-pr.yml

@@ -5,8 +5,8 @@ on:
 
 jobs:
   create-pr:
+    if: github.ref_type == 'branch'
     runs-on: ubuntu-latest
-    if: ${{ github.ref_type == 'branch' }}
     steps:
     -
       name: Checkout Branch ${{ github.ref_name }}

.github/workflows/auto-release.yml

@@ -6,10 +6,10 @@ on:
 
 jobs:
   create-release:
+    if: github.event.pull_request.merged
     runs-on: ubuntu-latest
     steps:
     -
-      if: github.event.pull_request.merged == true
       name: Get Pull Request Title
       run: echo "PR_TITLE=${{ github.event.pull_request.title }}" >> $GITHUB_ENV
       shell: bash

5.6/Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.4x-2.1.6
+FROM bfren/apache:apache2.4.4x-2.1.7
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 

7.4/Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.5x-2.1.6
+FROM bfren/apache:apache2.4.5x-2.1.7
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 

8.0/Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.5x-2.1.6
+FROM bfren/apache:apache2.4.5x-2.1.7
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 

VERSION

@@ -1 +1 @@
-2.1.7
+2.1.8

generate-dockerfiles.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_REVISION="2.1.6"
+BASE_REVISION="2.1.7"
 echo "Base: ${BASE_REVISION}"
 
 PHP_VERSIONS="5.6 7.4 8.0"