v2.1.7 (#32)

Minor updates
* Using latest base images

Build updates
* Using PAT instead of default token
* Renaming publish workflows

Author: bfren

.github/workflows/auto-pr.yml

@@ -6,16 +6,16 @@ on:
 jobs:
   create-pr:
     runs-on: ubuntu-latest
+    if: ${{ github.ref_type == 'branch' }}
     steps:
     -
-      if: github.ref_type == 'branch'
       name: Checkout Branch ${{ github.ref_name }}
       uses: actions/checkout@v3
     -
       name: Create Pull Request
       uses: bfren/pull-request@v2
       with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+        github_token: ${{ secrets.PAT }}
         destination_branch: main
         pr_title: ${{ github.ref_name }}
         pr_body: "Merging branch to create ${{ github.ref_name }}."

.github/workflows/auto-release.yml

@@ -17,5 +17,6 @@ jobs:
       name: Create Release ${{ env.PR_TITLE }}
       uses: bfren/action-gh-release@v1
       with:
+        token: ${{ secrets.PAT }}
         name: ${{ env.PR_TITLE }}
         tag_name: ${{ env.PR_TITLE }}

.github/workflows/main-5_6.yml renamed to .github/workflows/publish-5_6.yml

@@ -1,4 +1,4 @@
-name: main-5_6
+name: publish-5_6
 
 on:
   release:

.github/workflows/main-7_4.yml renamed to .github/workflows/publish-7_4.yml

@@ -1,4 +1,4 @@
-name: main-7_4
+name: publish-7_4
 
 on:
   release:

.github/workflows/main-8_0.yml renamed to .github/workflows/publish-8_0.yml

@@ -1,4 +1,4 @@
-name: main-8_0
+name: publish-8_0
 
 on:
   release:

5.6/Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.4x-2.1.4
+FROM bfren/apache:apache2.4.4x-2.1.6
 
 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.4
+FROM bfren/apache:apache2.4.5x-2.1.6
 
 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.4
+FROM bfren/apache:apache2.4.5x-2.1.6
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 

VERSION

@@ -1 +1 @@
-2.1.6
+2.1.7

generate-dockerfiles.sh

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