Skip to content

Commit 57cb6d7

Browse files
mistralozmistraloz
authored
Merge pull request #394 from mistraloz/feature/add-8.4-remove-7.2-and-7.3
Add php8.4
2 parents 87616d3 + c1c00dc commit 57cb6d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+1017
-1553
lines changed

‎.github/workflows/workflow.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
php_version: ['8.3','8.2','8.1','8.0','7.4','7.3','7.2']
18+
php_version: ['8.4', '8.3','8.2','8.1','8.0','7.4']
1919
variant: ['apache','cli','fpm']
2020
# builder: [ {arch: "amd64", os: "ubuntu-latest"}, {arch: "arm64", os: "macos-latest"}]
2121
builder: [ {arch: "amd64", os: "ubuntu-latest"}, {arch: "arm64", os: "ubuntu-latest"}]
@@ -64,7 +64,7 @@ jobs:
6464
strategy:
6565
fail-fast: false
6666
matrix:
67-
php_version: ['8.3','8.2','8.1','8.0','7.4','7.3','7.2']
67+
php_version: ['8.4', 8.3','8.2','8.1','8.0','7.4']
6868
variant: ['apache','cli','fpm']
6969
steps:
7070
- name: Checkout

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ The sqlite3 extension was previously enabled by default, but must now be enabled
6969

7070
The project layout has been deeply changed. There is now only one branch for all the PHP versions.
7171
Each extension now has its own installation script in the `/extensions/core` directory with symlinks for the
72-
extensions in the `/extensions/7.1` and `/extensions/7.2` directory based on the targeted PHP version.
72+
extensions in the `/extensions/8.3` and `/extensions/8.4` directory based on the targeted PHP version.

‎Dockerfile.apache

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG REPO="thecodingmachine/php"
88
ARG TAG_PREFIX=""
99

1010
ARG FROM_IMAGE="${REPO}:${TAG_PREFIX}${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache"
11-
FROM $FROM_IMAGE
11+
FROM ${FROM_IMAGE}
1212
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
1313
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1414

‎Dockerfile.cli

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG REPO="thecodingmachine/php"
88
ARG TAG_PREFIX=""
99

1010
ARG FROM_IMAGE="${REPO}:${TAG_PREFIX}${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli"
11-
FROM $FROM_IMAGE
11+
FROM ${FROM_IMAGE}
1212
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
1313
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1414

‎Dockerfile.fpm

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG REPO="thecodingmachine/php"
88
ARG TAG_PREFIX=""
99

1010
ARG FROM_IMAGE="${REPO}:${TAG_PREFIX}${PHP_VERSION}-${GLOBAL_VERSION}-slim-fpm"
11-
FROM $FROM_IMAGE
11+
FROM ${FROM_IMAGE}
1212
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
1313
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1414

‎Dockerfile.slim.apache

+4-4
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ RUN composer global require bamarni/symfony-console-autocomplete && \
152152
USER root
153153

154154

155-
ENV APACHE_CONFDIR /etc/apache2
156-
ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
155+
ENV APACHE_CONFDIR=/etc/apache2
156+
ENV APACHE_ENVVARS=$APACHE_CONFDIR/envvars
157157

158158
RUN set -eux; \
159159
apt-get update; \
@@ -199,8 +199,8 @@ COPY utils/apache-docker-php.conf /etc/apache2/conf-available/docker-php.conf
199199

200200
RUN a2enconf docker-php
201201

202-
ENV PHP_EXTRA_BUILD_DEPS apache2-dev
203-
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
202+
ENV PHP_EXTRA_BUILD_DEPS=apache2-dev
203+
ENV PHP_EXTRA_CONFIGURE_ARGS="--with-apxs2 --disable-cgi"
204204

205205
# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
206206
STOPSIGNAL SIGWINCH

‎Dockerfile.slim.fpm

+1-5
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,7 @@ RUN ln -s /etc/php/${PHP_VERSION}/mods-available/generated_conf.ini /etc/php/${P
265265
sed -i 's/^user = www-data/;user = www-data/g' /etc/php/${PHP_VERSION}/fpm/pool.d/www.conf && \
266266
sed -i 's/^group = www-data/;group = www-data/g' /etc/php/${PHP_VERSION}/fpm/pool.d/www.conf && \
267267
sed -i 's#listen = /run/php/php${PHP_VERSION}-fpm.sock#;listen = /run/php/php${PHP_VERSION}-fpm.sock#g' /etc/php/${PHP_VERSION}/fpm/pool.d/www.conf && \
268-
sed -i "s#pid = /run/php/php${PHP_VERSION}-fpm.pid#;pid = /run/php/php${PHP_VERSION}-fpm.pid#g" /etc/php/${PHP_VERSION}/fpm/php-fpm.conf && \
269-
if [[ "$PHP_VERSION" = "7.2" ]]; then \
270-
sed -i 's/^log_limit =/;log_limit =/g' /etc/php/${PHP_VERSION}/fpm/pool.d/docker.conf && \
271-
sed -i 's/^decorate_workers_output =/;decorate_workers_output =/g' /etc/php/${PHP_VERSION}/fpm/pool.d/docker.conf; \
272-
fi
268+
sed -i "s#pid = /run/php/php${PHP_VERSION}-fpm.pid#;pid = /run/php/php${PHP_VERSION}-fpm.pid#g" /etc/php/${PHP_VERSION}/fpm/php-fpm.conf
273269

274270

275271
USER docker

‎Makefile

+14-15
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ blueprint: ## Generate all blueprints file
44
@if ! type orbit >/dev/null 2>&1; then echo "Missing orbit dependency, please install from https://github.com/gulien/orbit/"; exit 1; fi
55
orbit run generate
66

7-
test-latest: test-8.3 ## Test the latest build only
7+
test-latest: test-8.4 ## Test the latest build only
88

99
_test-prerequisites: blueprint
1010
docker pull ubuntu:20.04
1111

12-
test-quick: ## Test 8.0, 8.1, 8.2 and 8.3 quickly
13-
VERSION=8.0 VARIANT=cli $(MAKE) _test-version-quick
14-
VERSION=8.1 VARIANT=cli $(MAKE) _test-version-quick
12+
test-quick: ## Test 8.2, 8.3 and 8.4 quickly
1513
VERSION=8.2 VARIANT=cli $(MAKE) _test-version-quick
1614
VERSION=8.3 VARIANT=cli $(MAKE) _test-version-quick
15+
VERSION=8.4 VARIANT=cli $(MAKE) _test-version-quick
1716

1817
test-8.3: ## Test php8.3 build only
1918
VERSION=8.3 VARIANT=cli $(MAKE) _test-version
@@ -30,18 +29,18 @@ test-8.1: ## Test php8.1 build only
3029
VERSION=8.1 VARIANT=apache $(MAKE) _test-version
3130
VERSION=8.1 VARIANT=fpm $(MAKE) _test-version
3231

33-
test-8.0: ## Test php8.0 build only
34-
VERSION=8.0 VARIANT=cli $(MAKE) _test-version
35-
VERSION=8.0 VARIANT=apache $(MAKE) _test-version
36-
VERSION=8.0 VARIANT=fpm $(MAKE) _test-version
32+
test-8.4: ## Test php8.4 build only
33+
VERSION=8.4 VARIANT=cli $(MAKE) _test-version
34+
VERSION=8.4 VARIANT=apache $(MAKE) _test-version
35+
VERSION=8.4 VARIANT=fpm $(MAKE) _test-version
3736

3837
test-node: ## Test node builds only
39-
VERSION=8.3 VARIANT=cli NODE=12 $(MAKE) _test-node
40-
VERSION=8.3 VARIANT=cli NODE=14 $(MAKE) _test-node
41-
VERSION=8.3 VARIANT=cli NODE=16 $(MAKE) _test-node
42-
VERSION=8.3 VARIANT=cli NODE=18 $(MAKE) _test-node
43-
VERSION=8.3 VARIANT=cli NODE=20 $(MAKE) _test-node
44-
VERSION=8.3 VARIANT=cli NODE=22 $(MAKE) _test-node
38+
VERSION=8.4 VARIANT=cli NODE=12 $(MAKE) _test-node
39+
VERSION=8.4 VARIANT=cli NODE=14 $(MAKE) _test-node
40+
VERSION=8.4 VARIANT=cli NODE=16 $(MAKE) _test-node
41+
VERSION=8.4 VARIANT=cli NODE=18 $(MAKE) _test-node
42+
VERSION=8.4 VARIANT=cli NODE=20 $(MAKE) _test-node
43+
VERSION=8.4 VARIANT=cli NODE=22 $(MAKE) _test-node
4544

4645
_test-node: _test-prerequisites ## Test node for VERSION="" and VARIANT=""
4746
docker buildx bake --load \
@@ -65,4 +64,4 @@ _test-version-quick: _test-prerequisites ## Test php build for VERSION="" and VA
6564
notify-send -u critical "Tests passed with success ($(VERSION)-$(VARIANT)) - without node-*"
6665

6766
clean: ## Clean dangles image after build
68-
rm -rf /tmp/buildx-cache
67+
rm -rf /tmp/buildx-cache

0 commit comments

Comments
 (0)