AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch skia-build-tools to debian11.

Browse Source 
This allows us to use a newer Clang version that supports C++17.

Change-Id: Ifbff4dbd1f1da0212ea633eb81beb50ebe7744ac
Bug: skia:12875
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501479
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
This commit is contained in:
John Stiles 2022-01-28 11:19:09 -05:00 committed by SkCQ
parent 952bcb0732
commit 43abfa13a7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Makefile
View File

@ -10,4 +10,4 @@ CMAKE_VERSION=3.13.4_v4
push-cmake-release:
docker build --no-cache --tag cmake-release ./cmake-release
docker tag cmake-release gcr.io/skia-public/cmake-release:${CMAKE_VERSION}
docker push gcr.io/skia-public/cmake-release:${CMAKE_VERSION}
docker push gcr.io/skia-public/cmake-release:${CMAKE_VERSION}

5
docker/skia-build-tools/Dockerfile
View File

@ -1,7 +1,8 @@
# Dockerfile for building an image with all the tools needed to checkout and build Skia.
FROM launcher.gcr.io/google/clang-debian9 AS build
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
FROM launcher.gcr.io/google/debian11 AS build
RUN apt update && apt dist-upgrade -y && apt install -y \
git \
clang \
python \
curl \
build-essential \