diff options
| author | Kevin Lubick <kjlubick@google.com> | 2019-02-01 13:32:44 -0500 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2019-02-01 18:58:46 +0000 |
| commit | 9a2bb09202fbf4169dac9e57acc4729e7dc7e03f (patch) | |
| tree | 09741133560d3257e77188ac698aa85abdbec907 /docker | |
| parent | 3ed198faf93ad040b4d5a55e3efdbf1b9b2a227c (diff) | |
| download | platform_external_skqp-9a2bb09202fbf4169dac9e57acc4729e7dc7e03f.tar.gz platform_external_skqp-9a2bb09202fbf4169dac9e57acc4729e7dc7e03f.tar.bz2 platform_external_skqp-9a2bb09202fbf4169dac9e57acc4729e7dc7e03f.zip | |
CMake: distinguish between file and dir copies by presence of '.' in src path
ANGLE's build requires a file copy. Nema's build requires a dir copy. CMake
uses a different command for each. gn does not distinguish which. We make
a guess that happens to work for these two use cases based on the whether
the base file name of the src contains a '.'
Change-Id: I3503fd9d632abda3f8f952d0eef964019d932bea
Reviewed-on: https://skia-review.googlesource.com/c/188626
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/README.md | 4 | ||||
| -rw-r--r-- | docker/cmake-release/Dockerfile | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/README.md b/docker/README.md index 51616b9c50..24aa23a82a 100644 --- a/docker/README.md +++ b/docker/README.md @@ -58,8 +58,8 @@ It gets manually pushed anytime there's an update to the Dockerfile or relevant installed libraries. To push: docker build -t cmake-release ./cmake-release/ - docker tag cmake-release gcr.io/skia-public/cmake-release:3.13.1_v1 - docker push gcr.io/skia-public/cmake-release:3.13.1_v1 + docker tag cmake-release gcr.io/skia-public/cmake-release:3.13.1_v2 + docker push gcr.io/skia-public/cmake-release:3.13.1_v2 For testing the image locally, the following flow can be helpful: diff --git a/docker/cmake-release/Dockerfile b/docker/cmake-release/Dockerfile index d58e98757d..40f8fa5b2e 100644 --- a/docker/cmake-release/Dockerfile +++ b/docker/cmake-release/Dockerfile @@ -8,6 +8,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \ libfontconfig-dev \ libgl1-mesa-dev \ libglu1-mesa-dev \ + libxi-dev \ && groupadd -g 2000 skia \ && useradd -u 2000 -g 2000 skia |