Skip to content

Commit 427b10b

Browse files
bfrenbfren
authored
v2.4.0 (#62)
Major updates * Adding PHP 8.2.0
1 parent 7623879 commit 427b10b

10 files changed

Lines changed: 221 additions & 3 deletions

File tree

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

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: dev-8_2
2+
3+
on:
4+
push:
5+
branches: ['**']
6+
tags-ignore: ['**']
7+
workflow_dispatch:
8+
9+
jobs:
10+
test-8_2:
11+
runs-on: ubuntu-latest
12+
steps:
13+
-
14+
name: Checkout code
15+
uses: actions/checkout@v3
16+
build-8_2:
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@v2
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.2/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.2-dev
65+
bfren/apache-php:php8.2-${{ steps.version.outputs.contents }}-beta
66+
ghcr.io/bfren/apache-php:php8.2-dev
67+
ghcr.io/bfren/apache-php:php8.2-${{ steps.version.outputs.contents }}-beta
68+
-
69+
name: Image digest
70+
run: echo ${{ steps.docker_build.outputs.digest }}

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

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
name: publish-8_2
2+
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
8+
jobs:
9+
publish-8_2:
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@v2
22+
with:
23+
file: ./8.2/overlay/tmp/PHP_REVISION
24+
id: php_revision
25+
-
26+
name: Read image version
27+
uses: bfren/read-file@v2
28+
with:
29+
file: ./VERSION_MAJOR
30+
id: version_major
31+
-
32+
name: Read image version
33+
uses: bfren/read-file@v2
34+
with:
35+
file: ./VERSION_MINOR
36+
id: version_minor
37+
-
38+
name: Read image version
39+
uses: bfren/read-file@v2
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.2/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.2
80+
bfren/apache-php:php8.2-${{ steps.version_major.outputs.contents }}
81+
bfren/apache-php:php8.2-${{ steps.version_minor.outputs.contents }}
82+
bfren/apache-php:php8.2-${{ 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.2
89+
ghcr.io/bfren/apache-php:php8.2-${{ steps.version_major.outputs.contents }}
90+
ghcr.io/bfren/apache-php:php8.2-${{ steps.version_minor.outputs.contents }}
91+
ghcr.io/bfren/apache-php:php8.2-${{ 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 }}

‎8.2/APACHE_BASE‎

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

‎8.2/Dockerfile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
FROM bfren/apache:apache2.4.5x-2.2.15
2+
3+
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
4+
5+
ARG BF_IMAGE
6+
ARG BF_VERSION
7+
8+
ENV \
9+
# PHP config directory
10+
PHP_DIR=/etc/php8 \
11+
# www.conf override: log_level
12+
PHP_FPM_LOG_LEVEL="notice" \
13+
# php.ini template to use, or 'custom' if you want to bind your own custom php.ini -
14+
# which will cause the other PHP_INI_* environment variables to be ignored
15+
PHP_INI="production" \
16+
# php.ini override: display_errors
17+
PHP_INI_DISPLAY_ERRORS= \
18+
# php.ini override: display_startup_errors
19+
PHP_INI_DISPLAY_STARTUP_ERRORS= \
20+
# php.ini override: error_log
21+
PHP_INI_ERROR_LOG="/var/log/php8/error.log" \
22+
# php.ini override: err-r_reporting
23+
PHP_INI_ERROR_REPORTING= \
24+
# php.ini override: memory_limit
25+
PHP_INI_MEMORY_LIMIT="256M" \
26+
# php.ini override: max_post
27+
PHP_INI_MAX_POST="64M" \
28+
# php.ini override: max_upload
29+
PHP_INI_MAX_UPLOAD="64M" \
30+
# php.ini override: session_max_lifetime
31+
PHP_SESSION_MAX_LIFETIME=86400
32+
33+
COPY ./overlay /
34+
COPY ./8.2/overlay /
35+
36+
RUN bf-install

‎8.2/overlay/tmp/PHP_BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8.2.0-r0

‎8.2/overlay/tmp/PHP_REVISION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8.2.0

‎8.2/overlay/tmp/install-php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/sh
2+
3+
set -euo pipefail
4+
5+
6+
#======================================================================================================================
7+
# Install PHP8.
8+
#======================================================================================================================
9+
10+
apk add --no-cache \
11+
php82=${1} \
12+
php82-apache2=${1} \
13+
php82-common=${1} \
14+
php82-session=${1}

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.4
1+
2.4.0

‎VERSION_MINOR‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3
1+
2.4

‎generate-dockerfiles.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ docker pull bfren/alpine
77
BASE_REVISION="2.2.15"
88
echo "Base: ${BASE_REVISION}"
99

10-
PHP_VERSIONS="5.6 7.4 8.0 8.1"
10+
PHP_VERSIONS="5.6 7.4 8.0 8.1 8.2"
1111
for V in ${PHP_VERSIONS} ; do
1212

1313
echo "PHP ${V}"

0 commit comments

Comments
 (0)