Skip to content

Fix Alpine builds #2168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattleibow merged 3 commits into from
Jul 14, 2022
Merged

Fix Alpine builds #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da66eb7
Fix Alpine builds
mattleibow Jul 14, 2022
03018ba
try this
mattleibow Jul 14, 2022
728667f
Fix local builds
mattleibow Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/Docker/alpine/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/Docker/alpine/amd64/build-local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
2 changes: 1 addition & 1 deletion scripts/Docker/debian9/amd64/build-local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
2 changes: 1 addition & 1 deletion scripts/Docker/debian9/clang-cross/build-local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
2 changes: 1 addition & 1 deletion scripts/Docker/wasm/build-local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) .
Expand Down