From b522f14975871ce941ac18c1a8a5728f5a74f9a0 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 30 Jan 2025 09:22:33 +0000 Subject: [PATCH] force pull base image before building docker image --- linux/ca-certificates/debian/build.gradle | 2 +- linux/jdk/alpine/build.gradle | 4 ++-- linux/jdk/alpine/src/main/packaging/Dockerfile | 2 +- linux/jdk/alpine/src/main/packaging/temurin/8/APKBUILD | 4 ++++ linux/jdk/debian/build.gradle | 6 +++--- linux/jdk/redhat/build.gradle | 4 ++-- linux/jdk/suse/build.gradle | 4 ++-- linux/jre/alpine/build.gradle | 4 ++-- linux/jre/alpine/src/main/packaging/Dockerfile | 2 +- linux/jre/debian/build.gradle | 6 +++--- linux/jre/redhat/build.gradle | 4 ++-- linux/jre/suse/build.gradle | 4 ++-- linux_new/jdk/alpine/build.gradle | 4 ++-- linux_new/jdk/alpine/src/main/packaging/Dockerfile | 2 +- linux_new/jdk/debian/build.gradle | 10 +++++----- linux_new/jdk/rhel/build.gradle | 4 ++-- linux_new/jdk/suse/build.gradle | 4 ++-- linux_new/jre/alpine/build.gradle | 4 ++-- linux_new/jre/alpine/src/main/packaging/Dockerfile | 2 +- linux_new/jre/debian/build.gradle | 10 +++++----- linux_new/jre/rhel/build.gradle | 4 ++-- linux_new/jre/suse/build.gradle | 4 ++-- 22 files changed, 49 insertions(+), 45 deletions(-) diff --git a/linux/ca-certificates/debian/build.gradle b/linux/ca-certificates/debian/build.gradle index 6983a20d6..aa082895e 100644 --- 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 index 97529257d..e8d843a3c 100644 --- 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 index 5da218fc3..9cd961a3d 100644 --- 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 index 387270c0b..65b2334e0 100644 --- 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 index 54fc979ae..070e3c541 100644 --- 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 index d3a0e0c38..f3791fe17 100644 --- 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 index 92b363dd5..a2e786983 100644 --- 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 index 1c6dd3214..187a16057 100644 --- 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 index 5da218fc3..9cd961a3d 100644 --- 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 index 31c7b218b..63c837e27 100644 --- 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 index 5a2522a4a..25fb6b592 100644 --- 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 index e2bdd83f1..52f088d29 100644 --- 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 index 57c7f2a7a..559e076bb 100644 --- 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 index 5da218fc3..9cd961a3d 100644 --- 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 index 5aca73f2f..0b52860a3 100644 --- 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 index 0077cfd1c..284944317 100644 --- 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 index 7a7622965..356aa72bb 100644 --- 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 index 33163daa0..af116358a 100644 --- 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 index 5da218fc3..9cd961a3d 100644 --- 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 index d93e534e6..b286553e9 100644 --- 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 index a37426a37..3116e41df 100644 --- 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", diff --git a/linux_new/jre/suse/build.gradle b/linux_new/jre/suse/build.gradle index 4d31db28e..36dcd5aee 100644 --- a/linux_new/jre/suse/build.gradle +++ b/linux_new/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",