Skip to content

Commit 81d204a

Browse files
committed
Switch PHP to 8.4 in spc-alpine-docker
1 parent 3c75ee2 commit 81d204a

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

bin/spc-alpine-docker

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ else
5050
fi
5151

5252
# Detect docker env is setup
53-
if ! $DOCKER_EXECUTABLE images | grep -q cwcc-spc-$SPC_USE_ARCH; then
53+
if ! $DOCKER_EXECUTABLE images | grep -q cwcc-spc-$SPC_USE_ARCH-v2; then
5454
echo "Docker container does not exist. Building docker image ..."
55-
$DOCKER_EXECUTABLE build -t cwcc-spc-$SPC_USE_ARCH -f- . <<EOF
55+
$DOCKER_EXECUTABLE build -t cwcc-spc-$SPC_USE_ARCH-v2 -f- . <<EOF
5656
FROM $ALPINE_FROM
5757
$SPC_USE_MIRROR
5858
RUN apk update; \
@@ -79,21 +79,16 @@ RUN apk update; \
7979
linux-headers \
8080
m4 \
8181
make \
82-
php82 \
83-
php82-common \
84-
php82-pcntl \
85-
php82-phar \
86-
php82-posix \
87-
php82-sodium \
88-
php82-tokenizer \
89-
php82-dom \
90-
php82-xml \
91-
php82-xmlwriter \
92-
composer \
9382
pkgconfig \
9483
wget \
9584
xz
9685
86+
RUN curl -#fSL https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-linux-\$(uname -m).tar.gz | tar -xz -C /usr/local/bin && \
87+
chmod +x /usr/local/bin/php
88+
89+
RUN curl -#fSL https://getcomposer.org/download/latest-stable/composer.phar -o /usr/local/bin/composer && \
90+
chmod +x /usr/local/bin/composer
91+
9792
WORKDIR /app
9893
ADD ./src /app/src
9994
COPY ./composer.* /app/
@@ -124,4 +119,4 @@ MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/pkgroot:/app/pkgroot"
124119
# shellcheck disable=SC2068
125120
# shellcheck disable=SC2086
126121
# shellcheck disable=SC2090
127-
$DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT="$(pwd)" $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH bin/spc $@
122+
$DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT="$(pwd)" $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-v2 bin/spc $@

0 commit comments

Comments
 (0)