From 06200cb5cfd44dbd3edc221fa3f6c1a716a8c4c6 Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Thu, 8 Oct 2020 10:03:31 -0700 Subject: Improve multi-arch support. This change allows Dockerfiles named Dockerfile.$(ARCH) and makes list-images list only supported architectures. Updates #2847 PiperOrigin-RevId: 336108293 --- images/basic/mysql/Dockerfile | 2 +- images/basic/tomcat/Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 images/basic/tomcat/Dockerfile.aarch64 (limited to 'images/basic') 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 -- cgit v1.2.3