Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base-images/src/alpine-base/.devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"x-build": {
"name": "Alpine",
"image-name": "alpine-base",
"image-version": "1.12.0"
"image-version": "1.13.0"
},
"remoteUser": "vscode"
}
2 changes: 1 addition & 1 deletion base-images/src/alpine-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion features/src/php/devcontainer-feature.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
10 changes: 9 additions & 1 deletion features/src/php/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
Loading