From 40e78507afff836726867739bb15925535b8f883 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Thu, 14 Jul 2022 17:25:13 +0200
Subject: [PATCH] Fix Alpine builds (#2168)

---
 scripts/Docker/alpine/amd64/Dockerfile            | 4 ++--
 scripts/Docker/alpine/amd64/build-local.sh        | 2 +-
 scripts/Docker/debian9/amd64/build-local.sh       | 2 +-
 scripts/Docker/debian9/clang-cross/build-local.sh | 2 +-
 scripts/Docker/wasm/build-local.sh                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/Docker/alpine/amd64/Dockerfile b/scripts/Docker/alpine/amd64/Dockerfile
index 1c2c49ad71..6abf8fdcab 100644
--- 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
index 55b61dccb5..920fbfb093 100644
--- 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
index ecfdb8916f..f1cd926797 100644
--- 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
index 4d075da463..aa5bb12995 100644
--- 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
index 92dd21978c..bd52005e18 100644
--- 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) .