Skip to content

Commit 846e904

Browse files
authored
v2.3.0 (#133)
Major updates * Adding PHP 8.4.1 * Making PHP 8.4 the default version Minor updates * Using latest base images
1 parent 854a75c commit 846e904

19 files changed

+47
-17
lines changed

.github/workflows/dev.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ]
23+
php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
2424
runs-on: ubuntu-latest
2525
steps:
2626
-
@@ -91,7 +91,7 @@ jobs:
9191
-
9292
name: Build and push default tags
9393
id: docker_build_default
94-
if: matrix.php == '8.3'
94+
if: matrix.php == '8.4'
9595
uses: docker/build-push-action@v6
9696
with:
9797
file: ./${{ matrix.php }}/Dockerfile

.github/workflows/publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ]
13+
php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
1414
runs-on: ubuntu-latest
1515
steps:
1616
-
@@ -92,7 +92,7 @@ jobs:
9292
-
9393
name: Build and push default tags
9494
id: docker_build_default
95-
if: matrix.php == '8.3'
95+
if: matrix.php == '8.4'
9696
uses: docker/build-push-action@v6
9797
with:
9898
context: .

7.4/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/alpine:alpine3.15-2.7.5
1+
FROM ghcr.io/bfren/alpine:alpine3.15-2.8.0
22

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

8.0/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/alpine:alpine3.16-2.7.5
1+
FROM ghcr.io/bfren/alpine:alpine3.16-2.8.0
22

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

8.1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/alpine:alpine3.19-2.7.5
1+
FROM ghcr.io/bfren/alpine:alpine3.19-2.8.0
22

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

8.2/ALPINE_MINOR

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.20
1+
3.21

8.2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/alpine:alpine3.20-2.7.5
1+
FROM ghcr.io/bfren/alpine:alpine3.21-2.8.0
22

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

8.3/ALPINE_MINOR

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.20
1+
3.21

8.3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/alpine:alpine3.20-2.7.5
1+
FROM ghcr.io/bfren/alpine:alpine3.21-2.8.0
22

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

8.4/ALPINE_MINOR

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.21

8.4/Dockerfile

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FROM ghcr.io/bfren/alpine:alpine3.21-2.8.0
2+
3+
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php"
4+
5+
ARG BF_IMAGE
6+
ARG BF_PUBLISHING
7+
ARG BF_VERSION
8+
9+
COPY ./overlay /
10+
COPY ./8.4/overlay /
11+
12+
ENV \
13+
# PHP config directory
14+
BF_PHP_DIR="/etc/php84" \
15+
# offical php.ini template to download
16+
BF_PHP_ENV="production" \
17+
# space-separated extensions to install
18+
BF_PHP_EXT= \
19+
# PHP package prefix
20+
BF_PHP_PREFIX="php84"
21+
22+
RUN bf-install
23+
24+
VOLUME [ "/ws" ]
25+
26+
ENTRYPOINT [ "/init" ]

8.4/PHP_PREFIX

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
php84

8.4/overlay/tmp/PHP_BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8.4.1-r0

8.4/overlay/tmp/PHP_REVISION

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8.4.1

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.22
1+
2.3.0

VERSION_MINOR

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2
1+
2.3

generate-dockerfiles.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ set -euo pipefail
44

55
docker pull bfren/alpine
66

7-
BASE_VERSION="2.7.5"
7+
BASE_VERSION="2.8.0"
88
echo "Base: ${BASE_VERSION}"
99

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

1313
echo "PHP ${V}"

run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
IMAGE=`cat VERSION`
4-
PHP=${1:-8.3}
4+
PHP=${1:-8.4}
55

66
docker buildx build \
77
--load \

test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
IMAGE=php
44
VERSION=`cat VERSION`
5-
PHP=${1:-8.3}
5+
PHP=${1:-8.4}
66
TAG=${IMAGE}-test
77

88
docker buildx build \

0 commit comments

Comments
 (0)