From da66eb716c10d220c44484644d6bfab8885132d5 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 14 Jul 2022 06:53:25 +0200 Subject: [PATCH 1/3] Fix Alpine builds --- scripts/Docker/alpine/amd64/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Docker/alpine/amd64/Dockerfile b/scripts/Docker/alpine/amd64/Dockerfile index 1c2c49ad717..fbc813524ad 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 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 bash curl wget git build-base ninja fontconfig-dev libintl +RUN apk add --no-cache samurai clang python3 --repository http://dl-cdn.alpinelinux.org/alpine/edge/main +RUN apk add --no-cache gn --repository http://dl-cdn.alpinelinux.org/alpine/edge/community ARG DOTNET_SDK_VERSION=3.1.412 From 03018baf48439a861b98001fc72dd2135d585868 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 14 Jul 2022 14:55:25 +0200 Subject: [PATCH 2/3] try this --- scripts/Docker/alpine/amd64/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Docker/alpine/amd64/Dockerfile b/scripts/Docker/alpine/amd64/Dockerfile index fbc813524ad..6abf8fdcabd 100644 --- a/scripts/Docker/alpine/amd64/Dockerfile +++ b/scripts/Docker/alpine/amd64/Dockerfile @@ -3,8 +3,8 @@ 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 git build-base ninja fontconfig-dev libintl -RUN apk add --no-cache samurai clang python3 --repository http://dl-cdn.alpinelinux.org/alpine/edge/main +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 gn --repository http://dl-cdn.alpinelinux.org/alpine/edge/community ARG DOTNET_SDK_VERSION=3.1.412 From 728667f9aef046022e26d054031c471da694c61a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 14 Jul 2022 15:07:58 +0200 Subject: [PATCH 3/3] Fix local builds --- 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 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Docker/alpine/amd64/build-local.sh b/scripts/Docker/alpine/amd64/build-local.sh index 55b61dccb50..920fbfb0935 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 ecfdb8916ff..f1cd9267971 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 4d075da4633..aa5bb12995e 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 92dd21978c4..bd52005e186 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) .