Drop support for Ubuntu 18.04 (#239)

Closes #230.
CircleCI-Public · Mar 6, 2023 · 54b4d40 · 54b4d40
1 parent 344115b
commit 54b4d40
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 151 deletions.
diff --git a/18.04/Dockerfile b/18.04/Dockerfile
diff --git a/GEN-CHECK b/GEN-CHECK
@@ -1 +1 @@
-GEN_CHECK=(18.04 20.04 22.04)
+GEN_CHECK=(20.04 22.04)
diff --git a/build-base-images.sh b/build-base-images.sh
@@ -3,6 +3,5 @@
 
 docker context create cimg
 docker buildx create --use cimg
-docker buildx build --platform=linux/amd64,linux/arm64 --file 18.04/Dockerfile -t cimg/base:edge-18.04 .
 docker buildx build --platform=linux/amd64,linux/arm64 --file 20.04/Dockerfile -t cimg/base:edge-20.04 .
 docker buildx build --platform=linux/amd64,linux/arm64 --file 22.04/Dockerfile -t cimg/base:edge-22.04 -t cimg/base:edge .
diff --git a/build-images.sh b/build-images.sh
@@ -3,6 +3,5 @@
 
 docker context create cimg
 docker buildx create --use cimg
-docker buildx build --platform=linux/amd64,linux/arm64 --file 18.04/Dockerfile -t cimg/base:18.04 -t cimg/base:18.04 .
 docker buildx build --platform=linux/amd64,linux/arm64 --file 20.04/Dockerfile -t cimg/base:20.04 -t cimg/base:20.04 .
 docker buildx build --platform=linux/amd64,linux/arm64 --file 22.04/Dockerfile -t cimg/base:22.04 -t cimg/base:22.04 .
diff --git a/build-monthly-images.sh b/build-monthly-images.sh
@@ -8,6 +8,5 @@ VERSION=$( date +%Y.%m )
 
 echo "The 'version' is ${VERSION}"
 
-docker buildx build --platform=linux/amd64,linux/arm64 --file 18.04/Dockerfile -t cimg/base:${VERSION}-18.04 -t cimg/base:current-18.04 .
 docker buildx build --platform=linux/amd64,linux/arm64 --file 20.04/Dockerfile -t cimg/base:${VERSION}-20.04 -t cimg/base:current-20.04 .
 docker buildx build --platform=linux/amd64,linux/arm64 --file 22.04/Dockerfile -t cimg/base:${VERSION}-22.04 -t cimg/base:${VERSION} -t cimg/base:current-22.04 -t cimg/base:current .
diff --git a/push-base-images.sh b/push-base-images.sh
@@ -3,6 +3,5 @@
 
 docker context create cimg
 docker buildx create --use cimg
-docker buildx build --push --platform=linux/amd64,linux/arm64 --file 18.04/Dockerfile -t cimg/base:edge-18.04
 docker buildx build --push --platform=linux/amd64,linux/arm64 --file 20.04/Dockerfile -t cimg/base:edge-20.04
 docker buildx build --push --platform=linux/amd64,linux/arm64 --file 22.04/Dockerfile -t cimg/base:edge-22.04 -t cimg/base:edge .
diff --git a/push-images.sh b/push-images.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 # Do not edit by hand; please use build scripts/templates to make changes
-docker push cimg/base:18.04
 docker push cimg/base:20.04
 docker push cimg/base:22.04
diff --git a/push-monthly-images.sh b/push-monthly-images.sh
@@ -6,6 +6,5 @@ docker buildx create --use cimg
 
 VERSION=$( date +%Y.%m )
 
-docker buildx build --push --platform=linux/amd64,linux/arm64 --file 18.04/Dockerfile -t cimg/base:${VERSION}-18.04 -t cimg/base:current-18.04 .
 docker buildx build --push --platform=linux/amd64,linux/arm64 --file 20.04/Dockerfile -t cimg/base:${VERSION}-20.04 -t cimg/base:current-20.04 .
 docker buildx build --push --platform=linux/amd64,linux/arm64 --file 22.04/Dockerfile -t cimg/base:${VERSION}-22.04 -t cimg/base:${VERSION} -t cimg/base:current-22.04 -t cimg/base:current .
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		GEN_CHECK=(18.04 20.04 22.04)
		GEN_CHECK=(20.04 22.04)