File tree Expand file tree Collapse file tree 1 file changed +9
-14
lines changed
Expand file tree Collapse file tree 1 file changed +9
-14
lines changed Original file line number Diff line number Diff line change 5050fi
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
5656FROM $ALPINE_FROM
5757$SPC_USE_MIRROR
5858RUN 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+
9792WORKDIR /app
9893ADD ./src /app/src
9994COPY ./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 $@
You can’t perform that action at this time.
0 commit comments