Skip to content

Commit 6d61171

Browse files
bfrenbfren
authored
v2.3.0 (#57)
Major updates * Adding PHP 8.1 build * Adding repo override Minor updates * Updating to PHP 7.4.32 and 8.0.24 Development updates * Ignore raw URLs
1 parent b509e72 commit 6d61171

19 files changed

Lines changed: 241 additions & 13 deletions

File tree

‎.github/workflows/dev-8_1.yml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: dev-8_1
2+
3+
on:
4+
push:
5+
branches: ['**']
6+
tags-ignore: ['**']
7+
workflow_dispatch:
8+
9+
jobs:
10+
test-8_1:
11+
runs-on: ubuntu-latest
12+
steps:
13+
-
14+
name: Checkout code
15+
uses: actions/checkout@v3
16+
build-8_1:
17+
runs-on: ubuntu-latest
18+
steps:
19+
-
20+
name: Checkout code
21+
uses: actions/checkout@v3
22+
-
23+
name: Get repository name
24+
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
25+
shell: bash
26+
-
27+
name: Read image version
28+
uses: bfren/read-file@v1
29+
with:
30+
file: ./VERSION
31+
id: version
32+
-
33+
name: Set up QEMU
34+
uses: docker/setup-qemu-action@v2
35+
-
36+
name: Set up Docker Buildx
37+
uses: docker/setup-buildx-action@v2
38+
-
39+
name: Login to DockerHub
40+
uses: docker/login-action@v2
41+
with:
42+
username: ${{ secrets.DOCKERHUB_USERNAME }}
43+
password: ${{ secrets.DOCKERHUB_TOKEN }}
44+
-
45+
name: Login to GitHub Container Registry
46+
uses: docker/login-action@v2
47+
with:
48+
registry: ghcr.io
49+
username: ${{ github.repository_owner }}
50+
password: ${{ secrets.GITHUB_TOKEN }}
51+
-
52+
name: Build and push
53+
id: docker_build
54+
uses: docker/build-push-action@v3
55+
with:
56+
context: .
57+
file: ./8.1/Dockerfile
58+
build-args: |
59+
BF_IMAGE=${{ env.REPOSITORY_NAME }}
60+
BF_VERSION=${{ steps.version.outputs.contents }}
61+
push: ${{ startsWith(github.ref, 'refs/heads/') }}
62+
platforms: linux/amd64,linux/arm/v7,linux/arm64
63+
tags: |
64+
bfren/apache-php:php8.1-dev
65+
bfren/apache-php:php8.1-${{ steps.version.outputs.contents }}-beta
66+
ghcr.io/bfren/apache-php:php8.1-dev
67+
ghcr.io/bfren/apache-php:php8.1-${{ steps.version.outputs.contents }}-beta
68+
-
69+
name: Image digest
70+
run: echo ${{ steps.docker_build.outputs.digest }}

‎.github/workflows/publish-8_1.yml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
name: publish-8_1
2+
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
8+
jobs:
9+
publish-8_1:
10+
runs-on: ubuntu-latest
11+
steps:
12+
-
13+
name: Checkout code
14+
uses: actions/checkout@v3
15+
-
16+
name: Get repository name
17+
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
18+
shell: bash
19+
-
20+
name: Read PHP version - revision
21+
uses: bfren/read-file@v1
22+
with:
23+
file: ./8.1/overlay/tmp/PHP_REVISION
24+
id: php_revision
25+
-
26+
name: Read image version
27+
uses: bfren/read-file@v1
28+
with:
29+
file: ./VERSION_MAJOR
30+
id: version_major
31+
-
32+
name: Read image version
33+
uses: bfren/read-file@v1
34+
with:
35+
file: ./VERSION_MINOR
36+
id: version_minor
37+
-
38+
name: Read image version
39+
uses: bfren/read-file@v1
40+
with:
41+
file: ./VERSION
42+
id: version
43+
-
44+
name: Set up QEMU
45+
uses: docker/setup-qemu-action@v2
46+
-
47+
name: Set up Docker Buildx
48+
uses: docker/setup-buildx-action@v2
49+
-
50+
name: Login to DockerHub
51+
uses: docker/login-action@v2
52+
with:
53+
username: ${{ secrets.DOCKERHUB_USERNAME }}
54+
password: ${{ secrets.DOCKERHUB_TOKEN }}
55+
-
56+
name: Login to GitHub Container Registry
57+
uses: docker/login-action@v2
58+
with:
59+
registry: ghcr.io
60+
username: ${{ github.repository_owner }}
61+
password: ${{ secrets.GITHUB_TOKEN }}
62+
-
63+
name: Build and push
64+
id: docker_build
65+
uses: docker/build-push-action@v3
66+
with:
67+
context: .
68+
file: ./8.1/Dockerfile
69+
build-args: |
70+
BF_IMAGE=${{ env.REPOSITORY_NAME }}
71+
BF_VERSION=${{ steps.version.outputs.contents }}
72+
push: true
73+
platforms: linux/amd64,linux/arm/v7,linux/arm64
74+
tags: |
75+
bfren/apache-php:php8
76+
bfren/apache-php:php8-${{ steps.version_major.outputs.contents }}
77+
bfren/apache-php:php8-${{ steps.version_minor.outputs.contents }}
78+
bfren/apache-php:php8-${{ steps.version.outputs.contents }}
79+
bfren/apache-php:php8.1
80+
bfren/apache-php:php8.1-${{ steps.version_major.outputs.contents }}
81+
bfren/apache-php:php8.1-${{ steps.version_minor.outputs.contents }}
82+
bfren/apache-php:php8.1-${{ steps.version.outputs.contents }}
83+
bfren/apache-php:php${{ steps.php_revision.outputs.contents }}
84+
ghcr.io/bfren/apache-php:php8
85+
ghcr.io/bfren/apache-php:php8-${{ steps.version_major.outputs.contents }}
86+
ghcr.io/bfren/apache-php:php8-${{ steps.version_minor.outputs.contents }}
87+
ghcr.io/bfren/apache-php:php8-${{ steps.version.outputs.contents }}
88+
ghcr.io/bfren/apache-php:php8.1
89+
ghcr.io/bfren/apache-php:php8.1-${{ steps.version_major.outputs.contents }}
90+
ghcr.io/bfren/apache-php:php8.1-${{ steps.version_minor.outputs.contents }}
91+
ghcr.io/bfren/apache-php:php8.1-${{ steps.version.outputs.contents }}
92+
ghcr.io/bfren/apache-php:php${{ steps.php_revision.outputs.contents }}
93+
-
94+
name: Image digest
95+
run: echo ${{ steps.docker_build.outputs.digest }}

‎.markdownlint.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"MD013": false,
3-
"MD033": false
3+
"MD033": false,
4+
"MD034": false
45
}

‎5.6/overlay/etc/apk/repositories‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
http://dl-cdn.alpinelinux.org/alpine/v3.8/main
2+
http://dl-cdn.alpinelinux.org/alpine/v3.8/community
3+
@test http://dl-cdn.alpinelinux.org/alpine/v3.8/testing
4+
@edgemain http://dl-cdn.alpinelinux.org/alpine/edge/main
5+
@edgecomm http://dl-cdn.alpinelinux.org/alpine/edge/community
6+
@edgetest https://dl-cdn.alpinelinux.org/alpine/edge/testing

‎7.4/overlay/tmp/PHP_BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.4.30-r1
1+
7.4.32-r0

‎7.4/overlay/tmp/PHP_REVISION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.4.30
1+
7.4.32

‎7.4/overlay/tmp/install-php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -euo pipefail
88
#======================================================================================================================
99

1010
apk add --no-cache \
11-
php7@edgetest=${1} \
12-
php7-apache2@edgetest=${1} \
13-
php7-common@edgetest=${1} \
14-
php7-session@edgetest=${1}
11+
php7=${1} \
12+
php7-apache2=${1} \
13+
php7-common=${1} \
14+
php7-session=${1}

‎8.0/overlay/tmp/PHP_BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.22-r0
1+
8.0.24-r0

‎8.0/overlay/tmp/PHP_REVISION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.22
1+
8.0.24

‎8.1/APACHE_BASE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
apache2.4.5x

0 commit comments

Comments
 (0)