Skip to content

Commit 946c184

Browse files
bfrenbfren
authored
v2.4.2 (#64)
Minor updates * Using latest base images Build updates * Simplifying workflows using matrix
1 parent c8fb2f4 commit 946c184

9 files changed

Lines changed: 33 additions & 35 deletions

File tree

.github/workflows/dev-5_6.yml renamed to .github/workflows/dev.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: dev-5_6
1+
name: dev
22

33
on:
44
push:
@@ -7,13 +7,16 @@ on:
77
workflow_dispatch:
88

99
jobs:
10-
test-5_6:
10+
test:
1111
runs-on: ubuntu-latest
1212
steps:
1313
-
1414
name: Checkout code
1515
uses: actions/checkout@v3
16-
build-5_6:
16+
build:
17+
strategy:
18+
matrix:
19+
php: [ "5.6", "7.4", "8.0", "8.1", "8.2" ]
1720
runs-on: ubuntu-latest
1821
steps:
1922
-
@@ -54,17 +57,17 @@ jobs:
5457
uses: docker/build-push-action@v3
5558
with:
5659
context: .
57-
file: ./5.6/Dockerfile
60+
file: ./${{ matrix.php }}/Dockerfile
5861
build-args: |
5962
BF_IMAGE=${{ env.REPOSITORY_NAME }}
6063
BF_VERSION=${{ steps.version.outputs.contents }}
6164
push: ${{ startsWith(github.ref, 'refs/heads/') }}
6265
platforms: linux/amd64,linux/arm/v7,linux/arm64
6366
tags: |
64-
bfren/apache-php:php5.6-dev
65-
bfren/apache-php:php5.6-${{ steps.version.outputs.contents }}-beta
66-
ghcr.io/bfren/apache-php:php5.6-dev
67-
ghcr.io/bfren/apache-php:php5.6-${{ steps.version.outputs.contents }}-beta
67+
bfren/apache-php:php${{ matrix.php }}-dev
68+
bfren/apache-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-beta
69+
ghcr.io/bfren/apache-php:php${{ matrix.php }}-dev
70+
ghcr.io/bfren/apache-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-beta
6871
-
6972
name: Image digest
7073
run: echo ${{ steps.docker_build.outputs.digest }}

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

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
name: publish-5_6
1+
name: publish
22

33
on:
44
release:
55
types: [published]
66
workflow_dispatch:
77

88
jobs:
9-
publish-5_6:
9+
publish:
10+
strategy:
11+
matrix:
12+
php: [ "5.6", "7.4", "8.0", "8.1", "8.2" ]
1013
runs-on: ubuntu-latest
1114
steps:
1215
-
@@ -20,7 +23,7 @@ jobs:
2023
name: Read PHP version - revision
2124
uses: bfren/read-file@v2
2225
with:
23-
file: ./5.6/overlay/tmp/PHP_REVISION
26+
file: ./${{ matrix.php }}/overlay/tmp/PHP_REVISION
2427
id: php_revision
2528
-
2629
name: Read image version
@@ -65,30 +68,22 @@ jobs:
6568
uses: docker/build-push-action@v3
6669
with:
6770
context: .
68-
file: ./5.6/Dockerfile
71+
file: ./${{ matrix.php }}/Dockerfile
6972
build-args: |
7073
BF_IMAGE=${{ env.REPOSITORY_NAME }}
7174
BF_VERSION=${{ steps.version.outputs.contents }}
7275
push: true
7376
platforms: linux/amd64,linux/arm/v7,linux/arm64
7477
tags: |
75-
bfren/apache-php:php5
76-
bfren/apache-php:php5-${{ steps.version_major.outputs.contents }}
77-
bfren/apache-php:php5-${{ steps.version_minor.outputs.contents }}
78-
bfren/apache-php:php5-${{ steps.version.outputs.contents }}
79-
bfren/apache-php:php5.6
80-
bfren/apache-php:php5.6-${{ steps.version_major.outputs.contents }}
81-
bfren/apache-php:php5.6-${{ steps.version_minor.outputs.contents }}
82-
bfren/apache-php:php5.6-${{ steps.version.outputs.contents }}
78+
bfren/apache-php:php${{ matrix.php }}
79+
bfren/apache-php:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }}
80+
bfren/apache-php:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }}
81+
bfren/apache-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
8382
bfren/apache-php:php${{ steps.php_revision.outputs.contents }}
84-
ghcr.io/bfren/apache-php:php5
85-
ghcr.io/bfren/apache-php:php5-${{ steps.version_major.outputs.contents }}
86-
ghcr.io/bfren/apache-php:php5-${{ steps.version_minor.outputs.contents }}
87-
ghcr.io/bfren/apache-php:php5-${{ steps.version.outputs.contents }}
88-
ghcr.io/bfren/apache-php:php5.6
89-
ghcr.io/bfren/apache-php:php5.6-${{ steps.version_major.outputs.contents }}
90-
ghcr.io/bfren/apache-php:php5.6-${{ steps.version_minor.outputs.contents }}
91-
ghcr.io/bfren/apache-php:php5.6-${{ steps.version.outputs.contents }}
83+
ghcr.io/bfren/apache-php:php${{ matrix.php }}
84+
ghcr.io/bfren/apache-php:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }}
85+
ghcr.io/bfren/apache-php:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }}
86+
ghcr.io/bfren/apache-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
9287
ghcr.io/bfren/apache-php:php${{ steps.php_revision.outputs.contents }}
9388
-
9489
name: Image digest

‎5.6/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bfren/apache:apache2.4.4x-2.2.16
1+
FROM bfren/apache:apache2.4.4x-2.2.17
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
44

‎7.4/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bfren/apache:apache2.4.5x-2.2.16
1+
FROM bfren/apache:apache2.4.5x-2.2.17
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
44

‎8.0/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bfren/apache:apache2.4.5x-2.2.16
1+
FROM bfren/apache:apache2.4.5x-2.2.17
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
44

‎8.1/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bfren/apache:apache2.4.5x-2.2.16
1+
FROM bfren/apache:apache2.4.5x-2.2.17
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
44

‎8.2/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bfren/apache:apache2.4.5x-2.2.16
1+
FROM bfren/apache:apache2.4.5x-2.2.17
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
44

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.1
1+
2.4.2

‎generate-dockerfiles.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44

55
docker pull bfren/alpine
66

7-
BASE_REVISION="2.2.16"
7+
BASE_REVISION="2.2.17"
88
echo "Base: ${BASE_REVISION}"
99

1010
PHP_VERSIONS="5.6 7.4 8.0 8.1 8.2"

0 commit comments

Comments
 (0)