Fix Alpine builds (#2168)

mono · Jul 14, 2022 · 40e7850 · 40e7850
1 parent 8f81be2
commit 40e7850
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/scripts/Docker/alpine/amd64/Dockerfile b/scripts/Docker/alpine/amd64/Dockerfile
@@ -3,9 +3,9 @@ FROM amd64/alpine:3.9
 # Arguments:
 #   DOTNET_SDK_VERSION   - the version of dotnet for the Cake script        [ 3.1.412 | * ]
 
-RUN apk add --no-cache bash curl wget python python3 git build-base ninja fontconfig-dev libintl
+RUN apk add --no-cache bash curl wget python python3 git build-base ninja fontconfig-dev libintl clang
 RUN apk add --no-cache samurai --repository http://dl-cdn.alpinelinux.org/alpine/edge/main
-RUN apk add --no-cache clang gn --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing
+RUN apk add --no-cache gn --repository http://dl-cdn.alpinelinux.org/alpine/edge/community
 
 ARG DOTNET_SDK_VERSION=3.1.412
 

diff --git a/scripts/Docker/alpine/amd64/build-local.sh b/scripts/Docker/alpine/amd64/build-local.sh
@@ -6,5 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 (cd $DIR && docker build --tag skiasharp-alpine .)
 (cd $DIR/../../../../ && \
     docker run --rm --name skiasharp-alpine --volume $(pwd):/work skiasharp-alpine /bin/bash -c "\
-        dotnet tool restore && \
+        dotnet tool restore ; \
         dotnet cake --target=externals-linux --configuration=Release --buildarch=x64 --variant=alpine")
diff --git a/scripts/Docker/debian9/amd64/build-local.sh b/scripts/Docker/debian9/amd64/build-local.sh
@@ -6,5 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 (cd $DIR && docker build --tag skiasharp-linux .)
 (cd $DIR/../../../../ && \
     docker run --rm --name skiasharp-linux --volume $(pwd):/work skiasharp-linux /bin/bash -c "\
-        dotnet tool restore && \
+        dotnet tool restore ; \
         dotnet cake --target=externals-linux --configuration=Release --buildarch=x64")
diff --git a/scripts/Docker/debian9/clang-cross/build-local.sh b/scripts/Docker/debian9/clang-cross/build-local.sh
@@ -13,5 +13,5 @@ fi
 (cd $DIR && docker build --tag skiasharp-$ARCH $BUILD_ARGS .)
 (cd $DIR/../../../../ && 
     docker run --rm --name skiasharp-$ARCH --volume $(pwd):/work skiasharp-$ARCH /bin/bash -c "\
-        dotnet tool restore && \
+        dotnet tool restore ; \
         dotnet cake --target=externals-linux-clang-cross --configuration=Release --buildarch=$ARCH")
diff --git a/scripts/Docker/wasm/build-local.sh b/scripts/Docker/wasm/build-local.sh
@@ -13,7 +13,7 @@ fi
 (cd $DIR && docker build --tag skiasharp-wasm $VERSION_ARGS .)
 (cd $DIR/../../../ && \
     docker run --rm --name skiasharp-wasm --volume $(pwd):/work skiasharp-wasm /bin/bash -c "\
-        dotnet tool restore && \
+        dotnet tool restore ; \
         dotnet cake --target=externals-wasm --emscriptenVersion=$EMSCRIPTEN_VERSION")
 
 # sudo chown -R $(id -u):$(id -g) .