diff --git a/base-images/src/alpine-base/.devcontainer.json b/base-images/src/alpine-base/.devcontainer.json index 8ccbf3fb..9025254c 100644 --- a/base-images/src/alpine-base/.devcontainer.json +++ b/base-images/src/alpine-base/.devcontainer.json @@ -6,7 +6,7 @@ "x-build": { "name": "Alpine", "image-name": "alpine-base", - "image-version": "1.12.0" + "image-version": "1.13.0" }, "remoteUser": "vscode" } diff --git a/base-images/src/alpine-base/Dockerfile b/base-images/src/alpine-base/Dockerfile index 04400c6c..5af9f82a 100644 --- a/base-images/src/alpine-base/Dockerfile +++ b/base-images/src/alpine-base/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.23.3@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 +FROM alpine:3.24.1@sha256:28bd5fe8b56d1bd048e5babf5b10710ebe0bae67db86916198a6eec434943f8b ARG USERNAME=vscode ARG USER_UID=1000 diff --git a/features/src/php/devcontainer-feature.json b/features/src/php/devcontainer-feature.json index 85d3a16d..933831d9 100644 --- a/features/src/php/devcontainer-feature.json +++ b/features/src/php/devcontainer-feature.json @@ -2,7 +2,7 @@ "id": "php", "name": "PHP", "description": "Installs PHP into the Dev Environment", - "version": "3.0.0", + "version": "3.0.1", "documentationURL": "https://github.com/Automattic/vip-codespaces/tree/trunk/features/src/php", "options": { "version": { diff --git a/features/src/php/install.sh b/features/src/php/install.sh index 49cb6c5e..f929ed2a 100755 --- a/features/src/php/install.sh +++ b/features/src/php/install.sh @@ -19,7 +19,7 @@ PHP_VERSION="${VERSION}" setup_php82_alpine() { if [ "${LITE_INSTALL}" != 'true' ]; then - EXTENSIONS="icu-data-full ghostscript php82-bcmath php82-intl php82-pecl-mcrypt php82-soap php82-pecl-igbinary php82-pecl-ssh2 php82-pecl-timezonedb" + EXTENSIONS="icu-data-full ghostscript php82-bcmath php82-pecl-mcrypt php82-soap php82-pecl-igbinary php82-pecl-ssh2 php82-pecl-timezonedb" else EXTENSIONS= fi @@ -211,6 +211,14 @@ setup_php84_alpine() { apk del --no-cache php84-dev gcc make libc-dev graphicsmagick-dev libtool fi + if [ "${LITE_INSTALL}" != 'true' ]; then + apk add --no-cache php84-dev gcc make libc-dev + pecl84 channel-update pecl.php.net || true + pecl84 install timezonedb < /dev/null || true + echo "extension=timezonedb.so" > /etc/php84/conf.d/40_timezonedb.ini + apk del --no-cache php84-dev gcc make libc-dev + fi + # Alpine Edge: this symlink is broken rm -f /usr/bin/phar.phar