v2.3.1 (#58)

bfren · web-flow · commit 4f38eb315ad4 · 2022-11-02T17:07:07.000Z
Minor updates
* Using latest base images
* Updating to PHP 8.0.25 and 8.1.12

Build updates
* Updating read-file action
diff --git a/.github/workflows/dev-5_6.yml b/.github/workflows/dev-5_6.yml
@@ -25,7 +25,7 @@ jobs:
         shell: bash
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION
         id: version
diff --git a/.github/workflows/dev-7_4.yml b/.github/workflows/dev-7_4.yml
@@ -25,7 +25,7 @@ jobs:
         shell: bash
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION
         id: version
diff --git a/.github/workflows/dev-8_0.yml b/.github/workflows/dev-8_0.yml
@@ -25,7 +25,7 @@ jobs:
         shell: bash
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION
         id: version
diff --git a/.github/workflows/dev-8_1.yml b/.github/workflows/dev-8_1.yml
@@ -25,7 +25,7 @@ jobs:
         shell: bash
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION
         id: version
diff --git a/.github/workflows/publish-5_6.yml b/.github/workflows/publish-5_6.yml
@@ -18,25 +18,25 @@ jobs:
         shell: bash
       -
         name: Read PHP version - revision
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./5.6/overlay/tmp/PHP_REVISION
         id: php_revision
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION_MAJOR
         id: version_major
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION_MINOR
         id: version_minor
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION
         id: version
diff --git a/.github/workflows/publish-7_4.yml b/.github/workflows/publish-7_4.yml
@@ -18,25 +18,25 @@ jobs:
         shell: bash
       -
         name: Read PHP version - revision
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./7.4/overlay/tmp/PHP_REVISION
         id: php_revision
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION_MAJOR
         id: version_major
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION_MINOR
         id: version_minor
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION
         id: version
diff --git a/.github/workflows/publish-8_0.yml b/.github/workflows/publish-8_0.yml
@@ -18,25 +18,25 @@ jobs:
         shell: bash
       -
         name: Read PHP version - revision
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./8.0/overlay/tmp/PHP_REVISION
         id: php_revision
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION_MAJOR
         id: version_major
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION_MINOR
         id: version_minor
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION
         id: version
diff --git a/.github/workflows/publish-8_1.yml b/.github/workflows/publish-8_1.yml
@@ -18,25 +18,25 @@ jobs:
         shell: bash
       -
         name: Read PHP version - revision
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./8.1/overlay/tmp/PHP_REVISION
         id: php_revision
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION_MAJOR
         id: version_major
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION_MINOR
         id: version_minor
       -
         name: Read image version
-        uses: bfren/read-file@v1
+        uses: bfren/read-file@v2
         with:
           file: ./VERSION
         id: version
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.4x-2.2.12
+FROM bfren/apache:apache2.4.4x-2.2.13
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.5x-2.2.12
+FROM bfren/apache:apache2.4.5x-2.2.13
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
diff --git a/7.4/overlay/tmp/PHP_BUILD b/7.4/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-7.4.32-r0
+7.4.32-r2
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.5x-2.2.12
+FROM bfren/apache:apache2.4.5x-2.2.13
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
diff --git a/8.0/overlay/tmp/PHP_BUILD b/8.0/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.0.24-r0
+8.0.25-r0
diff --git a/8.0/overlay/tmp/PHP_REVISION b/8.0/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.0.24
+8.0.25
diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.5x-2.2.12
+FROM bfren/apache:apache2.4.5x-2.2.13
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
diff --git a/8.1/overlay/tmp/PHP_BUILD b/8.1/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.1.11-r0
+8.1.12-r0
diff --git a/8.1/overlay/tmp/PHP_REVISION b/8.1/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.1.11
+8.1.12
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.3.0
+2.3.1
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_REVISION="2.2.12"
+BASE_REVISION="2.2.13"
 echo "Base: ${BASE_REVISION}"
 
 PHP_VERSIONS="5.6 7.4 8.0 8.1"

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ jobs:`
`25`	`25`	`shell: bash`
`26`	`26`	`-`
`27`	`27`	`name: Read image version`
`28`		`- uses: bfren/read-file@v1`
	`28`	`+ uses: bfren/read-file@v2`
`29`	`29`	`with:`
`30`	`30`	`file: ./VERSION`
`31`	`31`	`id: version`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM bfren/apache:apache2.4.4x-2.2.12`
	`1`	`+FROM bfren/apache:apache2.4.4x-2.2.13`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM bfren/apache:apache2.4.5x-2.2.12`
	`1`	`+FROM bfren/apache:apache2.4.5x-2.2.13`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"`
`4`	`4`