Skip to content

Commit 8b918c4

Browse files
jakubboucekjakubboucek
authored
Merge pull request #73 from jakubboucek/php-8-4
PHP 8.4 is now stable
2 parents 9b3a53f + 0a50fd7 commit 8b918c4

10 files changed

+59
-89
lines changed

‎README.md

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Images for local development in [LAMP devstack](https://en.wikipedia.org/wiki/LA
2727

2828
## Main features
2929
- architecture: `linux/amd64`
30-
- current **PHP** versions: 8.3, 8.2 and 8.1 and RC pre-release of 8.4
30+
- current **PHP** versions: 8.4, 8.3, 8.2 and 8.1
3131
- unsupported **PHP** versions also available: 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6, 5.5 and 5.4 (with limited stability,
3232
unoptimized, unmaintained)
3333
- current versions of **MariaDB** 11.5, 11.4, 11.2, 10.11, 10.6, 10.5, and RC pre-release of 11.6
@@ -94,8 +94,8 @@ my_project/ <-- project's root
9494
Images are tagged by the cascaded SemVer:
9595
- `jakubboucek/lamp-devstack-php:latest` – means `latest` available stable PHP image,
9696
- `jakubboucek/lamp-devstack-php:8` – represents the highest PHP image of `8` version, but lower than `9.0.0`,
97-
- `jakubboucek/lamp-devstack-php:8.3` – represents the highest PHP image of `8.3` version, but lower than `8.4.0`,
98-
- `jakubboucek/lamp-devstack-php:8.3.0` – represents most specific PHP image, directly version `8.3.0`.
97+
- `jakubboucek/lamp-devstack-php:8.4` – represents the highest PHP image of `8.4` version, but lower than `8.5.0`,
98+
- `jakubboucek/lamp-devstack-php:8.4.0` – represents most specific PHP image, directly version `8.4.0`.
9999

100100
**Legacy PHP** images are tagged using different strategy, only latest revision for each minor version is available,
101101
use `-legacy` tag suffix:
@@ -115,28 +115,19 @@ use `-legacy` tag suffix:
115115
All PHP images have alternative variants with XDebug extension preinstalled, use `-debug` tag suffix, example:
116116
- `jakubboucek/lamp-devstack-php:debug`
117117
- `jakubboucek/lamp-devstack-php:8-debug`
118-
- `jakubboucek/lamp-devstack-php:8.3-debug`
119-
- `jakubboucek/lamp-devstack-php:8.3.0-debug`
120-
- `jakubboucek/lamp-devstack-php:8.4.0-rc-cli`
118+
- `jakubboucek/lamp-devstack-php:8.4-debug`
119+
- `jakubboucek/lamp-devstack-php:8.4.0-debug`
121120
- `jakubboucek/lamp-devstack-php:7.4-legacy-debug`
122121

123-
> Note: (Pre-release of PHP 8.4 contains unstable version of Xdebug)
122+
> Note: (PHP 8.4 temporary contains beta version of Xdebug)
124123
125124
All PHP images also have alternative CLI variants, use `-cli` tag suffix, example:
126125
- `jakubboucek/lamp-devstack-php:cli`
127126
- `jakubboucek/lamp-devstack-php:8-cli`
128-
- `jakubboucek/lamp-devstack-php:8.3-cli`
129-
- `jakubboucek/lamp-devstack-php:8.3.0-cli`
127+
- `jakubboucek/lamp-devstack-php:8.4-cli`
128+
- `jakubboucek/lamp-devstack-php:8.4.0-cli`
130129
- `jakubboucek/lamp-devstack-php:7.4-legacy-cli`
131130

132-
The RC pre-release of PHP 8.4 images have the `-rc` suffix, example:
133-
- `jakubboucek/lamp-devstack-php:8.4-rc`
134-
- `jakubboucek/lamp-devstack-php:8.4-0-rc`
135-
- `jakubboucek/lamp-devstack-php:8.4-0-rc-RC2`
136-
- `jakubboucek/lamp-devstack-php:8.4-rc-cli`
137-
- `jakubboucek/lamp-devstack-php:8.4-0-rc-cli`
138-
- `jakubboucek/lamp-devstack-php:8.4-0-rc-RC2-cli`
139-
140131
### Using MySQL
141132
MySQL server starts at the same time as the web server.
142133

‎build-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This note is not necessary for USE images, it's for BUILD him.
77
Run [`build-php.sh`](build-php.sh) script to build all of PHP versions.
88

99
To build only specific PHP version run only the target script on [`php` folder](php), for example:
10-
[`php/build-php-8.3.sh`](php/build-php-8.3.sh)
10+
[`php/build-php-8.4.sh`](php/build-php-8.4.sh)
1111

1212
To build older PHP versions run [`php/legacy/build-php-legacy.sh`](php/legacy/build-php-legacy.sh).
1313

‎check-pulls.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ docker pull php:8.2-cli-bookworm
99
docker pull php:8.2-apache-bookworm
1010
docker pull php:8.3-cli-bookworm
1111
docker pull php:8.3-apache-bookworm
12-
docker pull php:8.4-rc-cli-bookworm
13-
docker pull php:8.4-rc-apache-bookworm
12+
docker pull php:8.4-cli-bookworm
13+
docker pull php:8.4-apache-bookworm
1414

1515
docker pull mariadb:10.5
1616
docker pull mariadb:10.6

‎php/Dockerfile-8.4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM php:8.4-rc-apache-bookworm
1+
FROM php:8.4-apache-bookworm
22

33
LABEL maintainer="Jakub Bouček <[email protected]>"
4-
LABEL org.label-schema.name="PHP 8.4 (Pre-release, Apache module)"
4+
LABEL org.label-schema.name="PHP 8.4 (Apache module)"
55
LABEL org.label-schema.vcs-url="https://github.com/jakubboucek/docker-lamp-devstack"
66

77
# Workdir during installation

‎php/Dockerfile-8.4-cli

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM php:8.4-rc-cli-bookworm
1+
FROM php:8.4-cli-bookworm
22

33
LABEL maintainer="Jakub Bouček <[email protected]>"
4-
LABEL org.label-schema.name="PHP 8.4 (Pre-release, CLI)"
4+
LABEL org.label-schema.name="PHP 8.4 (CLI)"
55
LABEL org.label-schema.vcs-url="https://github.com/jakubboucek/docker-lamp-devstack"
66

77
# Workdir during installation

‎php/Dockerfile-8.4-debug

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM jakubboucek/lamp-devstack-php:8.4-rc
1+
FROM jakubboucek/lamp-devstack-php:8.4
22

3-
LABEL org.label-schema.name="PHP 8.4 (Pre-release, Apache module + Xdebug)"
3+
LABEL org.label-schema.name="PHP 8.4 (Apache module + Xdebug)"
44

55
# Configure Xdebug
66
COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini

‎php/build-php-8.3-cli.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ fi
1414
if [ "${NO_BUILD:-0}" -ne "1" ]; then
1515
docker build --progress plain -f ./Dockerfile-8.3-cli -t jakubboucek/lamp-devstack-php:8.3-cli ./
1616
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.3-cli php -r "echo PHP_RELEASE_VERSION;")
17-
docker tag jakubboucek/lamp-devstack-php:8.3-cli jakubboucek/lamp-devstack-php:cli
18-
docker tag jakubboucek/lamp-devstack-php:8.3-cli jakubboucek/lamp-devstack-php:8-cli
1917
docker tag jakubboucek/lamp-devstack-php:8.3-cli jakubboucek/lamp-devstack-php:8.3.${PHP_RELEASE}-cli
2018
fi
2119

@@ -29,6 +27,4 @@ if [ "${NO_PUSH:-0}" -ne "1" ]; then
2927
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.3-cli php -r "echo PHP_RELEASE_VERSION;")
3028
docker push jakubboucek/lamp-devstack-php:8.3.${PHP_RELEASE}-cli
3129
docker push jakubboucek/lamp-devstack-php:8.3-cli
32-
docker push jakubboucek/lamp-devstack-php:8-cli
33-
docker push jakubboucek/lamp-devstack-php:cli
3430
fi

‎php/build-php-8.3.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ if [ "${NO_BUILD:-0}" -ne "1" ]; then
1515
docker build --progress plain -f ./Dockerfile-8.3 -t jakubboucek/lamp-devstack-php:8.3 ./
1616
docker build --progress plain -f ./Dockerfile-8.3-debug -t jakubboucek/lamp-devstack-php:8.3-debug ./
1717
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.3 php -r "echo PHP_RELEASE_VERSION;")
18-
docker tag jakubboucek/lamp-devstack-php:8.3 jakubboucek/lamp-devstack-php:latest
19-
docker tag jakubboucek/lamp-devstack-php:8.3 jakubboucek/lamp-devstack-php:8
2018
docker tag jakubboucek/lamp-devstack-php:8.3 jakubboucek/lamp-devstack-php:8.3.${PHP_RELEASE}
21-
docker tag jakubboucek/lamp-devstack-php:8.3-debug jakubboucek/lamp-devstack-php:debug
22-
docker tag jakubboucek/lamp-devstack-php:8.3-debug jakubboucek/lamp-devstack-php:8-debug
2319
docker tag jakubboucek/lamp-devstack-php:8.3-debug jakubboucek/lamp-devstack-php:8.3.${PHP_RELEASE}-debug
2420
fi
2521

@@ -35,10 +31,6 @@ if [ "${NO_PUSH:-0}" -ne "1" ]; then
3531
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.3 php -r "echo PHP_RELEASE_VERSION;")
3632
docker push jakubboucek/lamp-devstack-php:8.3.${PHP_RELEASE}-debug
3733
docker push jakubboucek/lamp-devstack-php:8.3-debug
38-
docker push jakubboucek/lamp-devstack-php:8-debug
39-
docker push jakubboucek/lamp-devstack-php:debug
4034
docker push jakubboucek/lamp-devstack-php:8.3.${PHP_RELEASE}
4135
docker push jakubboucek/lamp-devstack-php:8.3
42-
docker push jakubboucek/lamp-devstack-php:8
43-
docker push jakubboucek/lamp-devstack-php:latest
4436
fi

‎php/build-php-8.4-cli.sh

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,30 @@ set -eux;
55

66
cd "$(dirname $0)";
77

8-
### PHP 8.4-rc
8+
### PHP 8.4
99
if [ "${NO_PULL:-0}" -ne "1" ]; then
10-
docker pull php:8.4-rc-cli-bookworm
11-
docker run --rm php:8.4-rc-cli-bookworm php --version
10+
docker pull php:8.4-cli-bookworm
11+
docker run --rm php:8.4-cli-bookworm php --version
1212
fi
1313

1414
if [ "${NO_BUILD:-0}" -ne "1" ]; then
15-
docker build --progress plain -f ./Dockerfile-8.4-cli -t jakubboucek/lamp-devstack-php:8.4-rc-cli ./
16-
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.4-rc-cli php -r "echo PHP_RELEASE_VERSION;")
17-
PHP_RELEASE_EXTRA=$(docker run --rm jakubboucek/lamp-devstack-php:8.4-rc-cli php -r "echo PHP_EXTRA_VERSION;")
18-
# docker tag jakubboucek/lamp-devstack-php:8.4-rc-cli jakubboucek/lamp-devstack-php:cli
19-
# docker tag jakubboucek/lamp-devstack-php:8.4-rc-cli jakubboucek/lamp-devstack-php:8-cli
20-
docker tag jakubboucek/lamp-devstack-php:8.4-rc-cli jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-rc-cli
21-
docker tag jakubboucek/lamp-devstack-php:8.4-rc-cli jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-rc-${PHP_RELEASE_EXTRA}-cli
15+
docker build --progress plain -f ./Dockerfile-8.4-cli -t jakubboucek/lamp-devstack-php:8.4-cli ./
16+
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.4-cli php -r "echo PHP_RELEASE_VERSION;")
17+
docker tag jakubboucek/lamp-devstack-php:8.4-cli jakubboucek/lamp-devstack-php:cli
18+
docker tag jakubboucek/lamp-devstack-php:8.4-cli jakubboucek/lamp-devstack-php:8-cli
19+
docker tag jakubboucek/lamp-devstack-php:8.4-cli jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-cli
2220
fi
2321

2422
if [ "${NO_TEST:-0}" -ne "1" ]; then
25-
docker run --rm jakubboucek/lamp-devstack-php:8.4-rc-cli php --version
26-
docker run --rm jakubboucek/lamp-devstack-php:8.4-rc-cli php -r "echo implode(', ', get_loaded_extensions()) . PHP_EOL;"
27-
docker run --rm jakubboucek/lamp-devstack-php:8.4-rc-cli php -r "var_export(gd_info()) . PHP_EOL;"
23+
docker run --rm jakubboucek/lamp-devstack-php:8.4-cli php --version
24+
docker run --rm jakubboucek/lamp-devstack-php:8.4-cli php -r "echo implode(', ', get_loaded_extensions()) . PHP_EOL;"
25+
docker run --rm jakubboucek/lamp-devstack-php:8.4-cli php -r "var_export(gd_info()) . PHP_EOL;"
2826
fi
2927

3028
if [ "${NO_PUSH:-0}" -ne "1" ]; then
31-
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.4-rc-cli php -r "echo PHP_RELEASE_VERSION;")
32-
PHP_RELEASE_EXTRA=$(docker run --rm jakubboucek/lamp-devstack-php:8.4-rc-cli php -r "echo PHP_EXTRA_VERSION;")
33-
docker push jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-rc-${PHP_RELEASE_EXTRA}-cli
34-
docker push jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-rc-cli
35-
docker push jakubboucek/lamp-devstack-php:8.4-rc-cli
36-
# docker push jakubboucek/lamp-devstack-php:8-cli
37-
# docker push jakubboucek/lamp-devstack-php:cli
29+
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.4-cli php -r "echo PHP_RELEASE_VERSION;")
30+
docker push jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-cli
31+
docker push jakubboucek/lamp-devstack-php:8.4-cli
32+
docker push jakubboucek/lamp-devstack-php:8-cli
33+
docker push jakubboucek/lamp-devstack-php:cli
3834
fi

‎php/build-php-8.4.sh

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,40 @@ set -eux;
55

66
cd "$(dirname $0)";
77

8-
### PHP 8.4-rc
8+
### PHP 8.4
99
if [ "${NO_PULL:-0}" -ne "1" ]; then
10-
docker pull php:8.4-rc-apache-bookworm
11-
docker run --rm php:8.4-rc-apache-bookworm php --version
10+
docker pull php:8.4-apache-bookworm
11+
docker run --rm php:8.4-apache-bookworm php --version
1212
fi
1313

1414
if [ "${NO_BUILD:-0}" -ne "1" ]; then
15-
docker build --progress plain -f ./Dockerfile-8.4 -t jakubboucek/lamp-devstack-php:8.4-rc ./
16-
docker build --progress plain -f ./Dockerfile-8.4-debug -t jakubboucek/lamp-devstack-php:8.4-rc-debug ./
17-
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.4-rc php -r "echo PHP_RELEASE_VERSION;")
18-
PHP_RELEASE_EXTRA=$(docker run --rm jakubboucek/lamp-devstack-php:8.4-rc php -r "echo PHP_EXTRA_VERSION;")
19-
# docker tag jakubboucek/lamp-devstack-php:8.4-rc jakubboucek/lamp-devstack-php:8
20-
# docker tag jakubboucek/lamp-devstack-php:8.4-rc jakubboucek/lamp-devstack-php:latest
21-
docker tag jakubboucek/lamp-devstack-php:8.4-rc jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-rc
22-
docker tag jakubboucek/lamp-devstack-php:8.4-rc jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-rc-${PHP_RELEASE_EXTRA}
23-
# docker tag jakubboucek/lamp-devstack-php:8.4-rc-debug jakubboucek/lamp-devstack-php:debug
24-
# docker tag jakubboucek/lamp-devstack-php:8.4-rc-debug jakubboucek/lamp-devstack-php:8-debug
25-
docker tag jakubboucek/lamp-devstack-php:8.4-rc-debug jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-rc-debug
26-
docker tag jakubboucek/lamp-devstack-php:8.4-rc-debug jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-rc-debug-${PHP_RELEASE_EXTRA}
15+
docker build --progress plain -f ./Dockerfile-8.4 -t jakubboucek/lamp-devstack-php:8.4 ./
16+
docker build --progress plain -f ./Dockerfile-8.4-debug -t jakubboucek/lamp-devstack-php:8.4-debug ./
17+
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.4 php -r "echo PHP_RELEASE_VERSION;")
18+
docker tag jakubboucek/lamp-devstack-php:8.4 jakubboucek/lamp-devstack-php:8
19+
docker tag jakubboucek/lamp-devstack-php:8.4 jakubboucek/lamp-devstack-php:latest
20+
docker tag jakubboucek/lamp-devstack-php:8.4 jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}
21+
docker tag jakubboucek/lamp-devstack-php:8.4-debug jakubboucek/lamp-devstack-php:debug
22+
docker tag jakubboucek/lamp-devstack-php:8.4-debug jakubboucek/lamp-devstack-php:8-debug
23+
docker tag jakubboucek/lamp-devstack-php:8.4-debug jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-debug
2724
fi
2825

2926
if [ "${NO_TEST:-0}" -ne "1" ]; then
30-
docker run --rm jakubboucek/lamp-devstack-php:8.4-rc php --version
31-
docker run --rm jakubboucek/lamp-devstack-php:8.4-rc-debug php --version
32-
docker run --rm jakubboucek/lamp-devstack-php:8.4-rc php -r "echo implode(', ', get_loaded_extensions()) . PHP_EOL;"
33-
docker run --rm jakubboucek/lamp-devstack-php:8.4-rc-debug php -r "echo implode(', ', get_loaded_extensions()) . PHP_EOL;"
34-
docker run --rm jakubboucek/lamp-devstack-php:8.4-rc php -r "var_export(gd_info()) . PHP_EOL;"
27+
docker run --rm jakubboucek/lamp-devstack-php:8.4 php --version
28+
docker run --rm jakubboucek/lamp-devstack-php:8.4-debug php --version
29+
docker run --rm jakubboucek/lamp-devstack-php:8.4 php -r "echo implode(', ', get_loaded_extensions()) . PHP_EOL;"
30+
docker run --rm jakubboucek/lamp-devstack-php:8.4-debug php -r "echo implode(', ', get_loaded_extensions()) . PHP_EOL;"
31+
docker run --rm jakubboucek/lamp-devstack-php:8.4 php -r "var_export(gd_info()) . PHP_EOL;"
3532
fi
3633

3734
if [ "${NO_PUSH:-0}" -ne "1" ]; then
38-
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.4-rc php -r "echo PHP_RELEASE_VERSION;")
39-
PHP_RELEASE_EXTRA=$(docker run --rm jakubboucek/lamp-devstack-php:8.4-rc php -r "echo PHP_EXTRA_VERSION;")
40-
docker push jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-rc-debug
41-
docker push jakubboucek/lamp-devstack-php:8.4-rc-debug
42-
# docker push jakubboucek/lamp-devstack-php:8-debug
43-
# docker push jakubboucek/lamp-devstack-php:debug
44-
docker push jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-rc-${PHP_RELEASE_EXTRA}
45-
docker push jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-rc
46-
docker push jakubboucek/lamp-devstack-php:8.4-rc
47-
# docker push jakubboucek/lamp-devstack-php:8
48-
# docker push jakubboucek/lamp-devstack-php:latest
35+
PHP_RELEASE=$(docker run --rm jakubboucek/lamp-devstack-php:8.4 php -r "echo PHP_RELEASE_VERSION;")
36+
docker push jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}-debug
37+
docker push jakubboucek/lamp-devstack-php:8.4-debug
38+
docker push jakubboucek/lamp-devstack-php:8-debug
39+
docker push jakubboucek/lamp-devstack-php:debug
40+
docker push jakubboucek/lamp-devstack-php:8.4.${PHP_RELEASE}
41+
docker push jakubboucek/lamp-devstack-php:8.4
42+
docker push jakubboucek/lamp-devstack-php:8
43+
docker push jakubboucek/lamp-devstack-php:latest
4944
fi

0 commit comments

Comments
 (0)