update enable-debug patch

This commit is contained in:
Robin Appelman 2024-02-22 14:40:42 +01:00
commit bc303d3484
2 changed files with 11 additions and 31 deletions

View file

@ -9,7 +9,7 @@ patch -N -p1 -d php < version.patch
versions=("8.0" "8.1" "8.2" "8.3") versions=("8.0" "8.1" "8.2" "8.3")
cd php; ./apply-templates.sh cd php; DOCKER_PHP_ENABLE_DEBUG=1 ./apply-templates.sh
for version in "${versions[@]}"; do for version in "${versions[@]}"; do
docker build -t icewind1991/php-debug:$version-fpm -f php/$version/bullseye/fpm/Dockerfile php/$version/bullseye/fpm docker build -t icewind1991/php-debug:$version-fpm -f php/$version/bullseye/fpm/Dockerfile php/$version/bullseye/fpm

View file

@ -1,16 +1,18 @@
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index 7c1d6a6..d02925e 100644 index f980ecd3..f239de1a 100644
--- a/Dockerfile-linux.template --- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template +++ b/Dockerfile-linux.template
@@ -50,6 +50,7 @@ RUN apk add --no-cache \ @@ -50,7 +50,8 @@ RUN apk add --no-cache \
curl \ curl \
openssl \
tar \ tar \
xz \ - xz
+ gdb \ + xz \
# https://github.com/docker-library/php/issues/494 + gdb
openssl
@@ -71,6 +72,7 @@ RUN set -eux; \ # ensure www-data user exists
RUN set -eux; \
@@ -67,6 +68,7 @@ RUN set -eux; \
ca-certificates \ ca-certificates \
curl \ curl \
xz-utils \ xz-utils \
@ -18,29 +20,7 @@ index 7c1d6a6..d02925e 100644
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
{{ ) end -}} {{ ) end -}}
@@ -332,6 +334,7 @@ RUN set -eux; \ @@ -414,7 +416,6 @@ RUN set -eux; \
--with-openssl \
--with-readline \
--with-zlib \
+ --enable-debug \
\
{{ if env.variant == "cli" then ( -}}
# https://github.com/docker-library/php/pull/1259
@@ -385,21 +388,12 @@ RUN set -eux; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
make install; \
- find \
- /usr/local \
- -type f \
- -perm '/0111' \
- -exec sh -euxc ' \
- strip --strip-all "$@" || : \
- ' -- '{}' + \
- ; \
make clean; \
\
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
cp -v php.ini-* "$PHP_INI_DIR/"; \ cp -v php.ini-* "$PHP_INI_DIR/"; \
\ \
cd /; \ cd /; \