Move common canvas/pathkit dockerfiles to more intuitive location
Also rename emsdk-base -> emsdk-release so it is consistent with
the container name.
Bug: skia:
NOTRY: true
Change-Id: Idec19bdeb64a64120d0890b2987c2dce0a57535a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/206909
Reviewed-by: Stephan Altmueller <stephana@google.com>
diff --git a/infra/canvaskit/build_canvaskit.sh b/infra/canvaskit/build_canvaskit.sh
index a747f03..74b8a6d 100755
--- a/infra/canvaskit/build_canvaskit.sh
+++ b/infra/canvaskit/build_canvaskit.sh
@@ -4,7 +4,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# This assumes it is being run inside a docker container of emsdk-base
+# This assumes it is being run inside a docker container of emsdk-release
# and a Skia checkout has been mounted at /SRC and the output directory
# is mounted at /OUT
diff --git a/infra/canvaskit/docker/Makefile b/infra/canvaskit/docker/Makefile
index e35db0d..9245d21 100644
--- a/infra/canvaskit/docker/Makefile
+++ b/infra/canvaskit/docker/Makefile
@@ -2,5 +2,5 @@
publish_canvaskit_emsdk:
docker build -t canvaskit-emsdk ./canvaskit-emsdk/
- docker tag emsdk-base gcr.io/skia-public/canvaskit-emsdk:${EMSDK_VERSION}
- docker push gcr.io/skia-public/canvaskit-emsdk:${EMSDK_VERSION}
\ No newline at end of file
+ docker tag canvaskit-emsdk gcr.io/skia-public/canvaskit-emsdk:${EMSDK_VERSION}
+ docker push gcr.io/skia-public/canvaskit-emsdk:${EMSDK_VERSION}
diff --git a/infra/cmake/build_skia.sh b/infra/cmake/build_skia.sh
index 4abcaaa..6e78dfa 100755
--- a/infra/cmake/build_skia.sh
+++ b/infra/cmake/build_skia.sh
@@ -4,7 +4,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# This assumes it is being run inside a docker container of emsdk-base
+# This assumes it is being run inside a docker container of emsdk-release
# and a Skia checkout has been mounted at /SRC and the output directory
# has been mounted at /OUT
diff --git a/infra/pathkit/build_pathkit.sh b/infra/pathkit/build_pathkit.sh
index 7431670..cb4adb1 100755
--- a/infra/pathkit/build_pathkit.sh
+++ b/infra/pathkit/build_pathkit.sh
@@ -4,7 +4,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# This assumes it is being run inside a docker container of emsdk-base
+# This assumes it is being run inside a docker container of emsdk-release
# and a Skia checkout has been mounted at /SRC and the output directory
# is mounted at /OUT
diff --git a/infra/pathkit/.gitignore b/infra/wasm-common/.gitignore
similarity index 100%
rename from infra/pathkit/.gitignore
rename to infra/wasm-common/.gitignore
diff --git a/infra/pathkit/Makefile b/infra/wasm-common/Makefile
similarity index 100%
rename from infra/pathkit/Makefile
rename to infra/wasm-common/Makefile
diff --git a/infra/wasm-common/README.md b/infra/wasm-common/README.md
new file mode 100644
index 0000000..4e7ff25
--- /dev/null
+++ b/infra/wasm-common/README.md
@@ -0,0 +1,4 @@
+This directory contains docker images that will be run on swarming to
+build/test/perf WASM code.
+
+For docker images that run on Cloud Build, see $SKIA_ROOT/docker.
\ No newline at end of file
diff --git a/infra/pathkit/docker/Makefile b/infra/wasm-common/docker/Makefile
similarity index 73%
rename from infra/pathkit/docker/Makefile
rename to infra/wasm-common/docker/Makefile
index 23ae95e..2af691e 100644
--- a/infra/pathkit/docker/Makefile
+++ b/infra/wasm-common/docker/Makefile
@@ -5,10 +5,10 @@
CHROME_VERSION=72.0.3626.121_v1
publish_emsdk_base:
- docker build --no-cache -t emsdk-base ./emsdk-base/
- docker tag emsdk-base gcr.io/skia-public/emsdk-release:${EMSDK_VERSION}
+ docker build --no-cache -t emsdk-release ./emsdk-release/
+ docker tag emsdk-release gcr.io/skia-public/emsdk-release:${EMSDK_VERSION}
docker push gcr.io/skia-public/emsdk-release:${EMSDK_VERSION}
- docker tag emsdk-base gcr.io/skia-public/emsdk-release:prod
+ docker tag emsdk-release gcr.io/skia-public/emsdk-release:prod
docker push gcr.io/skia-public/emsdk-release:prod
publish_karma_chrome_tests:
diff --git a/infra/pathkit/docker/README.md b/infra/wasm-common/docker/README.md
similarity index 96%
rename from infra/pathkit/docker/README.md
rename to infra/wasm-common/docker/README.md
index e4f4acc..008eb4b 100644
--- a/infra/pathkit/docker/README.md
+++ b/infra/wasm-common/docker/README.md
@@ -3,7 +3,7 @@
Docker files to ease working with PathKit and WASM.
-emsdk-base
+emsdk-release
----------
This image has an Emscripten SDK environment that can be used for
@@ -19,11 +19,11 @@
For testing the image locally, the following flow can be helpful:
- docker build -t emsdk-base ./emsdk-base/
+ docker build -t emsdk-release ./emsdk-release/
# Run bash in it to poke around and make sure things are properly installed
docker run -it emsdk-release /bin/bash
# Compile PathKit with the local image
- docker run -v $SKIA_ROOT:/SRC -v $SKIA_ROOT/out/dockerpathkit:/OUT emsdk-base /SRC/infra/pathkit/build_pathkit.sh
+ docker run -v $SKIA_ROOT:/SRC -v $SKIA_ROOT/out/dockerpathkit:/OUT emsdk-release /SRC/infra/pathkit/build_pathkit.sh
karma-chrome-tests
------------------
diff --git a/infra/pathkit/docker/emsdk-base/Dockerfile b/infra/wasm-common/docker/emsdk-base/Dockerfile
similarity index 100%
rename from infra/pathkit/docker/emsdk-base/Dockerfile
rename to infra/wasm-common/docker/emsdk-base/Dockerfile
diff --git a/infra/pathkit/docker/gold-karma-chrome-tests/Dockerfile b/infra/wasm-common/docker/gold-karma-chrome-tests/Dockerfile
similarity index 100%
rename from infra/pathkit/docker/gold-karma-chrome-tests/Dockerfile
rename to infra/wasm-common/docker/gold-karma-chrome-tests/Dockerfile
diff --git a/infra/pathkit/docker/karma-chrome-tests/Dockerfile b/infra/wasm-common/docker/karma-chrome-tests/Dockerfile
similarity index 100%
rename from infra/pathkit/docker/karma-chrome-tests/Dockerfile
rename to infra/wasm-common/docker/karma-chrome-tests/Dockerfile
diff --git a/infra/pathkit/docker/perf-karma-chrome-tests/Dockerfile b/infra/wasm-common/docker/perf-karma-chrome-tests/Dockerfile
similarity index 100%
rename from infra/pathkit/docker/perf-karma-chrome-tests/Dockerfile
rename to infra/wasm-common/docker/perf-karma-chrome-tests/Dockerfile
diff --git a/infra/pathkit/gold/wasm_gold_aggregator.go b/infra/wasm-common/gold/wasm_gold_aggregator.go
similarity index 100%
rename from infra/pathkit/gold/wasm_gold_aggregator.go
rename to infra/wasm-common/gold/wasm_gold_aggregator.go
diff --git a/infra/pathkit/perf/wasm_perf_aggregator.go b/infra/wasm-common/perf/wasm_perf_aggregator.go
similarity index 100%
rename from infra/pathkit/perf/wasm_perf_aggregator.go
rename to infra/wasm-common/perf/wasm_perf_aggregator.go