force pull base image before building docker image

adoptium · Jan 30, 2025 · b522f14 · b522f14
1 parent 5ca028d
commit b522f14
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 45 deletions.
diff --git a/linux/ca-certificates/debian/build.gradle b/linux/ca-certificates/debian/build.gradle
@@ -86,7 +86,7 @@ task packageCaCertificatesDebian {
 		}
 		project.exec {
 			workingDir "src/main/packaging"
-			commandLine "docker", "build", "--no-cache",
+			commandLine "docker", "build", "--no-cache", "--pull",
 				"-t", "adoptium-packages-linux-cacerts-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 				"-f", "Dockerfile",

diff --git a/linux/jdk/alpine/build.gradle b/linux/jdk/alpine/build.gradle
@@ -84,7 +84,7 @@ task packageJdkAlpine {
 		if (gpgKey) {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-alpine",
 					"--secret", "id=gpg,src=${gpgKey}",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -94,7 +94,7 @@ task packageJdkAlpine {
 		} else {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-alpine",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"-f", "Dockerfile",

diff --git a/linux/jdk/alpine/src/main/packaging/Dockerfile b/linux/jdk/alpine/src/main/packaging/Dockerfile
@@ -1,6 +1,6 @@
 ARG CONTAINER_REGISTRY=""
 
-FROM ${CONTAINER_REGISTRY}alpine:latest
+FROM ${CONTAINER_REGISTRY}alpine:3.20
 ENV GOSU_VERSION 1.14
 
 RUN set -eux; \

diff --git a/linux/jdk/alpine/src/main/packaging/temurin/8/APKBUILD b/linux/jdk/alpine/src/main/packaging/temurin/8/APKBUILD
@@ -13,10 +13,14 @@ arch="x86_64"
 license="GPL-2.0-with-classpath-exception"
 makedepends="
 	alsa-lib-dev
+	freetype-dev
 	libpng-dev
 	libxcomposite-dev
 	libxinerama-dev
+	libxrandr-dev
 	libxrender-dev
+	libx11-dev
+	libxext-dev
 	libxslt
 	libxt-dev
 	libxtst-dev

diff --git a/linux/jdk/debian/build.gradle b/linux/jdk/debian/build.gradle
@@ -107,7 +107,7 @@ println "The Value Of ARCH is: $arch"
 if ("$arch" == "armhf") {
 		project.exec {
 			workingDir "src/main/packaging"
-			commandLine "docker", "build", "--no-cache",
+			commandLine "docker", "build", "--no-cache", "--pull",
 				"--build-arg", "IMAGE=arm32v7/debian:bullseye",
 				"-t", "adoptium-packages-linux-jdk-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -119,7 +119,7 @@ if ("$arch" == "armhf") {
 if ("$arch" == "riscv64") {
 		project.exec {
 			workingDir "src/main/packaging"
-			commandLine "docker", "build", "--no-cache",
+			commandLine "docker", "build", "--no-cache", "--pull",
 				"--build-arg", "IMAGE=riscv64/ubuntu:jammy",
 				"-t", "adoptium-packages-linux-jdk-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -131,7 +131,7 @@ if ("$arch" == "riscv64") {
 if ("$arch" != "armhf" && "$arch" != "riscv64"){
 		project.exec {
 			workingDir "src/main/packaging"
-			commandLine "docker", "build", "--no-cache",
+			commandLine "docker", "build", "--no-cache", "--pull",
 				"-t", "adoptium-packages-linux-jdk-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 				"-f", "Dockerfile",

diff --git a/linux/jdk/redhat/build.gradle b/linux/jdk/redhat/build.gradle
@@ -97,7 +97,7 @@ task packageJdkRedHat {
 		if (gpgKey) {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-redhat",
 					"--secret", "id=gpg,src=${gpgKey}",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -107,7 +107,7 @@ task packageJdkRedHat {
 		} else {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-redhat",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"-f", "Dockerfile",

diff --git a/linux/jdk/suse/build.gradle b/linux/jdk/suse/build.gradle
@@ -75,7 +75,7 @@ task packageJdkSuse {
 		if (gpgKey) {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-suse",
 					"--secret", "id=gpg,src=${gpgKey}",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -85,7 +85,7 @@ task packageJdkSuse {
 		} else {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-suse",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"-f", "Dockerfile",

diff --git a/linux/jre/alpine/build.gradle b/linux/jre/alpine/build.gradle
@@ -84,7 +84,7 @@ task packageJreAlpine {
 		if (gpgKey) {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-alpine",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"--secret", "id=gpg,src=${gpgKey}",
@@ -94,7 +94,7 @@ task packageJreAlpine {
 		} else {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-alpine",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"-f", "Dockerfile",

diff --git a/linux/jre/alpine/src/main/packaging/Dockerfile b/linux/jre/alpine/src/main/packaging/Dockerfile
@@ -1,6 +1,6 @@
 ARG CONTAINER_REGISTRY=""
 
-FROM ${CONTAINER_REGISTRY}alpine:latest
+FROM ${CONTAINER_REGISTRY}alpine:3.20
 ENV GOSU_VERSION 1.14
 
 RUN set -eux; \

diff --git a/linux/jre/debian/build.gradle b/linux/jre/debian/build.gradle
@@ -108,7 +108,7 @@ task packageJreDebian {
 		if ("$arch" == "armhf") {
 				project.exec {
 					workingDir "src/main/packaging"
-					commandLine "docker", "build", "--no-cache",
+					commandLine "docker", "build", "--no-cache", "--pull",
 					  "--build-arg", "IMAGE=arm32v7/debian:bullseye",
 						"-t", "adoptium-packages-linux-jdk-debian",
 						"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -120,7 +120,7 @@ task packageJreDebian {
 		if ("$arch" == "riscv64") {
 				project.exec {
 					workingDir "src/main/packaging"
-					commandLine "docker", "build", "--no-cache",
+					commandLine "docker", "build", "--no-cache", "--pull",
 						"--build-arg", "IMAGE=riscv64/ubuntu:jammy",
 						"-t", "adoptium-packages-linux-jdk-debian",
 						"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -132,7 +132,7 @@ task packageJreDebian {
 		if ("$arch" != "armhf" && "$arch" != "riscv64"){
 				project.exec {
 					workingDir "src/main/packaging"
-					commandLine "docker", "build", "--no-cache",
+					commandLine "docker", "build", "--no-cache", "--pull",
 						"-t", "adoptium-packages-linux-jdk-debian",
 						"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 						"-f", "Dockerfile",

diff --git a/linux/jre/redhat/build.gradle b/linux/jre/redhat/build.gradle
@@ -97,7 +97,7 @@ task packageJreRedHat {
 		if (gpgKey) {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-redhat",
 					"--secret", "id=gpg,src=${gpgKey}",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -107,7 +107,7 @@ task packageJreRedHat {
 		} else {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-redhat",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"-f", "Dockerfile",

diff --git a/linux/jre/suse/build.gradle b/linux/jre/suse/build.gradle
@@ -75,7 +75,7 @@ task packageJreSuse {
 		if (gpgKey) {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-suse",
 					"--secret", "id=gpg,src=${gpgKey}",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -85,7 +85,7 @@ task packageJreSuse {
 		} else {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-suse",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"-f", "Dockerfile",

diff --git a/linux_new/jdk/alpine/build.gradle b/linux_new/jdk/alpine/build.gradle
@@ -84,7 +84,7 @@ task packageJdkAlpine {
 		if (gpgKey) {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-alpine",
 					"--secret", "id=gpg,src=${gpgKey}",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -94,7 +94,7 @@ task packageJdkAlpine {
 		} else {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-alpine",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"-f", "Dockerfile",

diff --git a/linux_new/jdk/alpine/src/main/packaging/Dockerfile b/linux_new/jdk/alpine/src/main/packaging/Dockerfile
@@ -1,6 +1,6 @@
 ARG CONTAINER_REGISTRY=""
 
-FROM ${CONTAINER_REGISTRY}alpine:latest
+FROM ${CONTAINER_REGISTRY}alpine:3.20
 ENV GOSU_VERSION 1.14
 
 RUN set -eux; \

diff --git a/linux_new/jdk/debian/build.gradle b/linux_new/jdk/debian/build.gradle
@@ -107,7 +107,7 @@ println "The Value Of ARCH is: $arch"
 if ("$arch" == "armhf") {
 		project.exec {
 			workingDir "src/main/packaging"
-			commandLine "docker", "build", "--no-cache",
+			commandLine "docker", "build", "--no-cache", "--pull",
 				"--build-arg", "IMAGE=arm32v7/debian:bullseye",
 				"-t", "adoptium-packages-linux-jdk-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -119,7 +119,7 @@ if ("$arch" == "armhf") {
 if ("$arch" == "riscv64") {
 		project.exec {
 			workingDir "src/main/packaging"
-			commandLine "docker", "build", "--no-cache",
+			commandLine "docker", "build", "--no-cache", "--pull",
 				"--build-arg", "IMAGE=riscv64/ubuntu:jammy",
 				"-t", "adoptium-packages-linux-jdk-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -131,7 +131,7 @@ if ("$arch" == "riscv64") {
 if ("$arch" == "ppc64el") {
 		project.exec {
 			workingDir "src/main/packaging"
-			commandLine "docker", "build", "--no-cache",
+			commandLine "docker", "build", "--no-cache", "--pull",
 				"--build-arg", "IMAGE=ppc64le/debian:bullseye",
 				"-t", "adoptium-packages-linux-jdk-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -143,7 +143,7 @@ if ("$arch" == "ppc64el") {
 if ("$arch" == "s390x") {
 		project.exec {
 			workingDir "src/main/packaging"
-			commandLine "docker", "build", "--no-cache",
+			commandLine "docker", "build", "--no-cache", "--pull",
 				"--build-arg", "IMAGE=s390x/debian:bullseye",
 				"-t", "adoptium-packages-linux-jdk-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -154,7 +154,7 @@ if ("$arch" == "s390x") {
 if ("$arch" != "armhf" && "$arch" != "riscv64" && "$arch" != "s390x" && "$arch" != "ppc64el" ){
 		project.exec {
 			workingDir "src/main/packaging"
-			commandLine "docker", "build", "--no-cache",
+			commandLine "docker", "build", "--no-cache", "--pull",
 				"-t", "adoptium-packages-linux-jdk-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 				"-f", "Dockerfile",

diff --git a/linux_new/jdk/rhel/build.gradle b/linux_new/jdk/rhel/build.gradle
@@ -97,7 +97,7 @@ task packageJdkrhel {
 		if (gpgKey) {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-rhel",
 					"--secret", "id=gpg,src=${gpgKey}",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -107,7 +107,7 @@ task packageJdkrhel {
 		} else {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-rhel",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"-f", "Dockerfile",

diff --git a/linux_new/jdk/suse/build.gradle b/linux_new/jdk/suse/build.gradle
@@ -75,7 +75,7 @@ task packageJdkSuse {
 		if (gpgKey) {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-suse",
 					"--secret", "id=gpg,src=${gpgKey}",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -85,7 +85,7 @@ task packageJdkSuse {
 		} else {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-suse",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"-f", "Dockerfile",

diff --git a/linux_new/jre/alpine/build.gradle b/linux_new/jre/alpine/build.gradle
@@ -84,7 +84,7 @@ task packageJreAlpine {
 		if (gpgKey) {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-alpine",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"--secret", "id=gpg,src=${gpgKey}",
@@ -94,7 +94,7 @@ task packageJreAlpine {
 		} else {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-alpine",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"-f", "Dockerfile",

diff --git a/linux_new/jre/alpine/src/main/packaging/Dockerfile b/linux_new/jre/alpine/src/main/packaging/Dockerfile
@@ -1,6 +1,6 @@
 ARG CONTAINER_REGISTRY=""
 
-FROM ${CONTAINER_REGISTRY}alpine:latest
+FROM ${CONTAINER_REGISTRY}alpine:3.20
 ENV GOSU_VERSION 1.14
 
 RUN set -eux; \

diff --git a/linux_new/jre/debian/build.gradle b/linux_new/jre/debian/build.gradle
@@ -107,7 +107,7 @@ task packageJreDebian {
 		if ("$arch" == "armhf") {
 				project.exec {
 					workingDir "src/main/packaging"
-					commandLine "docker", "build", "--no-cache",
+					commandLine "docker", "build", "--no-cache", "--pull",
 						"--build-arg", "IMAGE=arm32v7/debian:bullseye",
 						"-t", "adoptium-packages-linux-jdk-debian",
 						"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -119,7 +119,7 @@ task packageJreDebian {
 		if ("$arch" == "riscv64") {
 				project.exec {
 					workingDir "src/main/packaging"
-					commandLine "docker", "build", "--no-cache",
+					commandLine "docker", "build", "--no-cache", "--pull",
 						"--build-arg", "IMAGE=riscv64/ubuntu:jammy",
 						"-t", "adoptium-packages-linux-jdk-debian",
 						"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -131,7 +131,7 @@ task packageJreDebian {
 		if ("$arch" == "s390x") {
 				project.exec {
 					workingDir "src/main/packaging"
-					commandLine "docker", "build", "--no-cache",
+					commandLine "docker", "build", "--no-cache", "--pull",
 						"--build-arg", "IMAGE=s390x/debian:bullseye",
 						"-t", "adoptium-packages-linux-jdk-debian",
 						"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -143,7 +143,7 @@ task packageJreDebian {
 		if ("$arch" == "ppc64el") {
 		project.exec {
 			workingDir "src/main/packaging"
-			commandLine "docker", "build", "--no-cache",
+			commandLine "docker", "build", "--no-cache", "--pull",
 				"--build-arg", "IMAGE=ppc64le/debian:bullseye",
 				"-t", "adoptium-packages-linux-jdk-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -155,7 +155,7 @@ task packageJreDebian {
 		if ("$arch" != "armhf" && "$arch" != "riscv64" && "$arch" != "s390x" && "$arch" != "ppc64el" ){
 				project.exec {
 					workingDir "src/main/packaging"
-					commandLine "docker", "build", "--no-cache",
+					commandLine "docker", "build", "--no-cache", "--pull",
 						"-t", "adoptium-packages-linux-jdk-debian",
 						"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 						"-f", "Dockerfile",

diff --git a/linux_new/jre/rhel/build.gradle b/linux_new/jre/rhel/build.gradle
@@ -97,7 +97,7 @@ task packageJrerhel {
 		if (gpgKey) {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-rhel",
 					"--secret", "id=gpg,src=${gpgKey}",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -107,7 +107,7 @@ task packageJrerhel {
 		} else {
 			project.exec {
 				workingDir "src/main/packaging"
-				commandLine "docker", "build", "--no-cache",
+				commandLine "docker", "build", "--no-cache", "--pull",
 					"-t", "adoptium-packages-linux-jdk-rhel",
 					"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 					"-f", "Dockerfile",