tools/docker: Remove ubuntu-18.04 support

* default python 3.6 is too old
google · Jul 24, 2023 · cce76e9 · cce76e9
1 parent 3381d85
commit cce76e9
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 216 deletions.
diff --git a/tools/docker/Makefile b/tools/docker/Makefile
@@ -106,7 +106,6 @@ help:
 	@echo -e "\t\t${BOLD}ubuntu-22.10${RESET} (Ubuntu 22.10)"
 	@echo -e "\t\t${BOLD}ubuntu-22.04${RESET} (Ubuntu 22.04 LTS, latest)"
 	@echo -e "\t\t${BOLD}ubuntu-20.04${RESET} (Ubuntu 20.04 LTS)"
-	@echo -e "\t\t${BOLD}ubuntu-18.04${RESET} (Ubuntu 18.04 LTS)"
 	@echo
 	@echo -e "\t${BOLD}<stage>${RESET}:"
 	@echo -e "\t\t${BOLD}env${RESET}"
@@ -409,7 +408,7 @@ DISTROS := \
  debian-10 debian-11 debian-sid \
  fedora-33 fedora-34 fedora-35 fedora-36 fedora-37 fedora-38 \
  opensuse-leap \
- ubuntu-18.04 ubuntu-20.04 ubuntu-22.04 ubuntu-22.10 ubuntu-23.04
+ ubuntu-20.04 ubuntu-22.04 ubuntu-22.10 ubuntu-23.04
 
 # List of stages
 STAGES := env devel

diff --git a/tools/docker/images/ubuntu-18.04.Dockerfile b/tools/docker/images/ubuntu-18.04.Dockerfile
diff --git a/tools/docker/test/ubuntu-18.04/cpp.Dockerfile b/tools/docker/test/ubuntu-18.04/cpp.Dockerfile
diff --git a/tools/docker/test/ubuntu-18.04/dotnet.Dockerfile b/tools/docker/test/ubuntu-18.04/dotnet.Dockerfile
diff --git a/tools/docker/test/ubuntu-18.04/java.Dockerfile b/tools/docker/test/ubuntu-18.04/java.Dockerfile
diff --git a/tools/docker/test/ubuntu-18.04/python.Dockerfile b/tools/docker/test/ubuntu-18.04/python.Dockerfile