From e7e0ac006f8e9dd9bd053893c917b212facf46bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Tue, 22 Aug 2023 11:13:51 +0200
Subject: [PATCH] more optims

---
 bin/setup-runtime     |  4 +++-
 bin/spc-alpine-docker | 36 ++++++++++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/bin/setup-runtime b/bin/setup-runtime
index 06ebd749..84061a19 100755
--- a/bin/setup-runtime
+++ b/bin/setup-runtime
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 # set error-quit, verbose, non-variable-quit
 set -eu
@@ -52,6 +52,8 @@ china)
 
 esac
 
+apk add --no-cache curl || true
+
 test -d "${__PROJECT__}"/downloads || mkdir "${__PROJECT__}"/downloads
 # download static php binary
 test -f "${__PROJECT__}"/downloads/runtime.tar.gz || { echo "Downloading $__PHP_RUNTIME_URL__ ..." && curl -#fSL -o "${__PROJECT__}"/downloads/runtime.tar.gz "$__PHP_RUNTIME_URL__" ; }
diff --git a/bin/spc-alpine-docker b/bin/spc-alpine-docker
index c4ff7d9c..b7ca9278 100755
--- a/bin/spc-alpine-docker
+++ b/bin/spc-alpine-docker
@@ -55,10 +55,38 @@ if ! $DOCKER_EXECUTABLE images | grep -q cwcc-spc-$SPC_USE_ARCH; then
     $DOCKER_EXECUTABLE build -t cwcc-spc-$SPC_USE_ARCH -f- . <<EOF
 FROM $ALPINE_FROM
 $SPC_USE_MIRROR
-RUN apk update
-RUN apk add bash file wget cmake gcc g++ jq autoconf git libstdc++ linux-headers make m4 libgcc binutils bison flex pkgconfig automake curl
-RUN apk add build-base xz php81 php81-common php81-pcntl php81-tokenizer php81-phar php81-posix php81-xml composer
-RUN mkdir /app
+RUN apk update; \
+    apk add --no-cache \
+        autoconf \
+        automake \
+        bash \
+        binutils \
+        bison \
+        build-base \
+        cmake \
+        composer \
+        curl \
+        file \
+        flex \
+        g++ \
+        gcc \
+        git \
+        jq \
+        libgcc \
+        libstdc++ \
+        linux-headers \
+        m4 \
+        make \
+        php81 \
+        php81-common \
+        php81-pcntl \
+        php81-phar \
+        php81-posix \
+        php81-tokenizer \
+        php81-xml \
+        pkgconfig \
+        wget \
+        xz
 WORKDIR /app
 ADD ./src /app/src
 ADD ./composer.json /app/composer.json