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

[infra] Update cmake docker image to be Debian 10

Browse Source 
Bug: skia:12256
Change-Id: Ic5cad6d6e5e7155f0adc26fca9f1172f33ce3b3a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/431260
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
This commit is contained in:
Kevin Lubick 2021-07-22 16:29:11 -04:00
parent 6940cff9c3
commit 747c321922
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/Makefile
View File

@ -3,4 +3,11 @@
push-skia-build-tools:
docker build -t skia-build-tools ./skia-build-tools
docker tag skia-build-tools gcr.io/skia-public/skia-build-tools:latest
docker push gcr.io/skia-public/skia-build-tools:latest
docker push gcr.io/skia-public/skia-build-tools:latest
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}

12
docker/cmake-release/Dockerfile
View File

@ -1,10 +1,17 @@
# Dockerfile for building Skia in release mode, using CMake.
FROM launcher.gcr.io/google/clang-debian9 AS build
FROM launcher.gcr.io/google/debian10
RUN echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
git \
python \
python3 \
curl \
clang-11 \
build-essential \
cmake \
libfreetype6-dev \
libfontconfig-dev \
libgl1-mesa-dev \
libglu1-mesa-dev \
@ -12,7 +19,8 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
&& groupadd -g 2000 skia \
&& useradd -u 2000 -g 2000 --home /workspace/__cache skia
RUN curl -s "https://cmake.org/files/v3.13/cmake-3.13.1-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local
RUN ln -s /usr/bin/clang-11 /usr/local/bin/clang && \
ln -s /usr/bin/clang++-11 /usr/local/bin/clang++
RUN cd /opt \
&& git clone 'https://chromium.googlesource.com/chromium/tools/depot_tools.git'

2
infra/bots/recipe_modules/build/cmake.py
View File

@ -4,7 +4,7 @@
from . import util
DOCKER_IMAGE = 'gcr.io/skia-public/cmake-release:3.13.1_v2'
DOCKER_IMAGE = 'gcr.io/skia-public/cmake-release:3.13.4_v4'
INNER_BUILD_SCRIPT = '/SRC/skia/infra/cmake/build_skia.sh'

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-CMake.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC",
"--volume",
"[START_DIR]/cache/docker/cmake:/OUT",
"gcr.io/skia-public/cmake-release:3.13.1_v2",
"gcr.io/skia-public/cmake-release:3.13.4_v4",
"/SRC/skia/infra/cmake/build_skia.sh"
],
"env": {