summaryrefslogtreecommitdiffhomepage
path: root/images/basic
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2020-10-08 10:03:31 -0700
committergVisor bot <gvisor-bot@google.com>2020-10-08 10:05:40 -0700
commit06200cb5cfd44dbd3edc221fa3f6c1a716a8c4c6 (patch)
treedfc61aeb03e781cd2200cb52ea23ef871b7ac3bd /images/basic
parent0c3134028d63774914f560d51588b11a3ecfed5e (diff)
Improve multi-arch support.
This change allows Dockerfiles named Dockerfile.$(ARCH) and makes list-images list only supported architectures. Updates #2847 PiperOrigin-RevId: 336108293
Diffstat (limited to 'images/basic')
-rw-r--r--images/basic/mysql/Dockerfile2
-rw-r--r--images/basic/tomcat/Dockerfile.aarch641
2 files changed, 2 insertions, 1 deletions
diff --git a/images/basic/mysql/Dockerfile b/images/basic/mysql/Dockerfile
index 95da9c48d..d87bfe55b 100644
--- a/images/basic/mysql/Dockerfile
+++ b/images/basic/mysql/Dockerfile
@@ -1 +1 @@
-FROM mysql:8.0.19
+FROM mysql/mysql-server:8.0.19
diff --git a/images/basic/tomcat/Dockerfile.aarch64 b/images/basic/tomcat/Dockerfile.aarch64
new file mode 100644
index 000000000..ed4096de9
--- /dev/null
+++ b/images/basic/tomcat/Dockerfile.aarch64
@@ -0,0 +1 @@
+FROM arm64v8/tomcat:8.0