Skip to content

Commit 6948f2c

Browse files
bfrenbfren
authored
v7.3.0 (#224)
Major updates * Adding PHP 8.4.1 * Making PHP 8.4 the default version Minor updates * Using latest base images
1 parent c2364f6 commit 6948f2c

File tree

19 files changed

+67
-21
lines changed

19 files changed

+67
-21
lines changed

‎.github/workflows/dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ]
17+
php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
1818
runs-on: ubuntu-latest
1919
steps:
2020
-

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
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
-

‎7.4/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ WORKDIR /tmp
88
RUN \
99
# get the Nu scripts from the PHP image overlay
1010
echo "Cloning Alpine overlay." && \
11-
apk add git && git clone --branch v2.2.20 https://github.com/bfren/docker-php.git && \
11+
apk add git && git clone --branch v2.3.0 https://github.com/bfren/docker-php.git && \
1212
mkdir /overlay && \
1313
mv docker-php/overlay/etc /overlay/
1414

@@ -17,7 +17,7 @@ RUN \
1717
# STAGE 1: create final image
1818
#======================================================================================================================
1919

20-
FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.3.14 AS final
20+
FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.4.0 AS final
2121
COPY --from=php /overlay /
2222

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

‎8.0/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ WORKDIR /tmp
88
RUN \
99
# get the Nu scripts from the PHP image overlay
1010
echo "Cloning Alpine overlay." && \
11-
apk add git && git clone --branch v2.2.20 https://github.com/bfren/docker-php.git && \
11+
apk add git && git clone --branch v2.3.0 https://github.com/bfren/docker-php.git && \
1212
mkdir /overlay && \
1313
mv docker-php/overlay/etc /overlay/
1414

@@ -17,7 +17,7 @@ RUN \
1717
# STAGE 1: create final image
1818
#======================================================================================================================
1919

20-
FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.3.14 AS final
20+
FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.4.0 AS final
2121
COPY --from=php /overlay /
2222

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

‎8.1/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ WORKDIR /tmp
88
RUN \
99
# get the Nu scripts from the PHP image overlay
1010
echo "Cloning Alpine overlay." && \
11-
apk add git && git clone --branch v2.2.20 https://github.com/bfren/docker-php.git && \
11+
apk add git && git clone --branch v2.3.0 https://github.com/bfren/docker-php.git && \
1212
mkdir /overlay && \
1313
mv docker-php/overlay/etc /overlay/
1414

@@ -17,7 +17,7 @@ RUN \
1717
# STAGE 1: create final image
1818
#======================================================================================================================
1919

20-
FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.3.14 AS final
20+
FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.4.0 AS final
2121
COPY --from=php /overlay /
2222

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

‎8.2/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ WORKDIR /tmp
88
RUN \
99
# get the Nu scripts from the PHP image overlay
1010
echo "Cloning Alpine overlay." && \
11-
apk add git && git clone --branch v2.2.20 https://github.com/bfren/docker-php.git && \
11+
apk add git && git clone --branch v2.3.0 https://github.com/bfren/docker-php.git && \
1212
mkdir /overlay && \
1313
mv docker-php/overlay/etc /overlay/
1414

@@ -17,7 +17,7 @@ RUN \
1717
# STAGE 1: create final image
1818
#======================================================================================================================
1919

20-
FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.20-6.3.14 AS final
20+
FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.21-6.4.0 AS final
2121
COPY --from=php /overlay /
2222

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

‎8.2/NGINX_BASE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nginx1.26-alpine3.20
1+
nginx1.26-alpine3.21

‎8.3/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ WORKDIR /tmp
88
RUN \
99
# get the Nu scripts from the PHP image overlay
1010
echo "Cloning Alpine overlay." && \
11-
apk add git && git clone --branch v2.2.20 https://github.com/bfren/docker-php.git && \
11+
apk add git && git clone --branch v2.3.0 https://github.com/bfren/docker-php.git && \
1212
mkdir /overlay && \
1313
mv docker-php/overlay/etc /overlay/
1414

@@ -17,7 +17,7 @@ RUN \
1717
# STAGE 1: create final image
1818
#======================================================================================================================
1919

20-
FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.20-6.3.14 AS final
20+
FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.21-6.4.0 AS final
2121
COPY --from=php /overlay /
2222

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

‎8.3/NGINX_BASE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nginx1.26-alpine3.20
1+
nginx1.26-alpine3.21

‎8.4/Dockerfile‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#======================================================================================================================
2+
# STAGE 0: get Nu scripts from the PHP image overlay
3+
#======================================================================================================================
4+
5+
FROM ghcr.io/bfren/alpine AS php
6+
7+
WORKDIR /tmp
8+
RUN \
9+
# get the Nu scripts from the PHP image overlay
10+
echo "Cloning Alpine overlay." && \
11+
apk add git && git clone --branch v2.3.0 https://github.com/bfren/docker-php.git && \
12+
mkdir /overlay && \
13+
mv docker-php/overlay/etc /overlay/
14+
15+
16+
#======================================================================================================================
17+
# STAGE 1: create final image
18+
#======================================================================================================================
19+
20+
FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.21-6.4.0 AS final
21+
COPY --from=php /overlay /
22+
23+
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
24+
25+
ARG BF_IMAGE
26+
ARG BF_PUBLISHING
27+
ARG BF_VERSION
28+
29+
COPY ./overlay /
30+
COPY ./8.4/overlay /
31+
32+
ENV \
33+
# PHP config directory
34+
BF_PHP_DIR="/etc/php84" \
35+
# offical php.ini template to download
36+
BF_PHP_ENV="production" \
37+
# space-separated extensions to install on startup
38+
BF_PHP_EXT= \
39+
# PHP package prefix
40+
BF_PHP_PREFIX="php84"
41+
42+
RUN bf-install

0 commit comments

Comments
 (0)