Skip to content

Commit 261e10a

Browse files
gdamsgdams
authored
force pull base image before building docker image (#1120)
1 parent 5ca028d commit 261e10a

File tree

21 files changed

+45
-45
lines changed

21 files changed

+45
-45
lines changed

‎linux/ca-certificates/debian/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ task packageCaCertificatesDebian {
8686
}
8787
project.exec {
8888
workingDir "src/main/packaging"
89-
commandLine "docker", "build", "--no-cache",
89+
commandLine "docker", "build", "--no-cache", "--pull",
9090
"-t", "adoptium-packages-linux-cacerts-debian",
9191
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
9292
"-f", "Dockerfile",

‎linux/jdk/alpine/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ task packageJdkAlpine {
8484
if (gpgKey) {
8585
project.exec {
8686
workingDir "src/main/packaging"
87-
commandLine "docker", "build", "--no-cache",
87+
commandLine "docker", "build", "--no-cache", "--pull",
8888
"-t", "adoptium-packages-linux-jdk-alpine",
8989
"--secret", "id=gpg,src=${gpgKey}",
9090
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -94,7 +94,7 @@ task packageJdkAlpine {
9494
} else {
9595
project.exec {
9696
workingDir "src/main/packaging"
97-
commandLine "docker", "build", "--no-cache",
97+
commandLine "docker", "build", "--no-cache", "--pull",
9898
"-t", "adoptium-packages-linux-jdk-alpine",
9999
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
100100
"-f", "Dockerfile",

‎linux/jdk/alpine/src/main/packaging/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CONTAINER_REGISTRY=""
22

3-
FROM ${CONTAINER_REGISTRY}alpine:latest
3+
FROM ${CONTAINER_REGISTRY}alpine:3.20
44
ENV GOSU_VERSION 1.14
55

66
RUN set -eux; \

‎linux/jdk/debian/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ println "The Value Of ARCH is: $arch"
107107
if ("$arch" == "armhf") {
108108
project.exec {
109109
workingDir "src/main/packaging"
110-
commandLine "docker", "build", "--no-cache",
110+
commandLine "docker", "build", "--no-cache", "--pull",
111111
"--build-arg", "IMAGE=arm32v7/debian:bullseye",
112112
"-t", "adoptium-packages-linux-jdk-debian",
113113
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -119,7 +119,7 @@ if ("$arch" == "armhf") {
119119
if ("$arch" == "riscv64") {
120120
project.exec {
121121
workingDir "src/main/packaging"
122-
commandLine "docker", "build", "--no-cache",
122+
commandLine "docker", "build", "--no-cache", "--pull",
123123
"--build-arg", "IMAGE=riscv64/ubuntu:jammy",
124124
"-t", "adoptium-packages-linux-jdk-debian",
125125
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -131,7 +131,7 @@ if ("$arch" == "riscv64") {
131131
if ("$arch" != "armhf" && "$arch" != "riscv64"){
132132
project.exec {
133133
workingDir "src/main/packaging"
134-
commandLine "docker", "build", "--no-cache",
134+
commandLine "docker", "build", "--no-cache", "--pull",
135135
"-t", "adoptium-packages-linux-jdk-debian",
136136
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
137137
"-f", "Dockerfile",

‎linux/jdk/redhat/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ task packageJdkRedHat {
9797
if (gpgKey) {
9898
project.exec {
9999
workingDir "src/main/packaging"
100-
commandLine "docker", "build", "--no-cache",
100+
commandLine "docker", "build", "--no-cache", "--pull",
101101
"-t", "adoptium-packages-linux-jdk-redhat",
102102
"--secret", "id=gpg,src=${gpgKey}",
103103
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -107,7 +107,7 @@ task packageJdkRedHat {
107107
} else {
108108
project.exec {
109109
workingDir "src/main/packaging"
110-
commandLine "docker", "build", "--no-cache",
110+
commandLine "docker", "build", "--no-cache", "--pull",
111111
"-t", "adoptium-packages-linux-jdk-redhat",
112112
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
113113
"-f", "Dockerfile",

‎linux/jdk/suse/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ task packageJdkSuse {
7575
if (gpgKey) {
7676
project.exec {
7777
workingDir "src/main/packaging"
78-
commandLine "docker", "build", "--no-cache",
78+
commandLine "docker", "build", "--no-cache", "--pull",
7979
"-t", "adoptium-packages-linux-jdk-suse",
8080
"--secret", "id=gpg,src=${gpgKey}",
8181
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -85,7 +85,7 @@ task packageJdkSuse {
8585
} else {
8686
project.exec {
8787
workingDir "src/main/packaging"
88-
commandLine "docker", "build", "--no-cache",
88+
commandLine "docker", "build", "--no-cache", "--pull",
8989
"-t", "adoptium-packages-linux-jdk-suse",
9090
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
9191
"-f", "Dockerfile",

‎linux/jre/alpine/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ task packageJreAlpine {
8484
if (gpgKey) {
8585
project.exec {
8686
workingDir "src/main/packaging"
87-
commandLine "docker", "build", "--no-cache",
87+
commandLine "docker", "build", "--no-cache", "--pull",
8888
"-t", "adoptium-packages-linux-jdk-alpine",
8989
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
9090
"--secret", "id=gpg,src=${gpgKey}",
@@ -94,7 +94,7 @@ task packageJreAlpine {
9494
} else {
9595
project.exec {
9696
workingDir "src/main/packaging"
97-
commandLine "docker", "build", "--no-cache",
97+
commandLine "docker", "build", "--no-cache", "--pull",
9898
"-t", "adoptium-packages-linux-jdk-alpine",
9999
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
100100
"-f", "Dockerfile",

‎linux/jre/alpine/src/main/packaging/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CONTAINER_REGISTRY=""
22

3-
FROM ${CONTAINER_REGISTRY}alpine:latest
3+
FROM ${CONTAINER_REGISTRY}alpine:3.20
44
ENV GOSU_VERSION 1.14
55

66
RUN set -eux; \

‎linux/jre/debian/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ task packageJreDebian {
108108
if ("$arch" == "armhf") {
109109
project.exec {
110110
workingDir "src/main/packaging"
111-
commandLine "docker", "build", "--no-cache",
111+
commandLine "docker", "build", "--no-cache", "--pull",
112112
"--build-arg", "IMAGE=arm32v7/debian:bullseye",
113113
"-t", "adoptium-packages-linux-jdk-debian",
114114
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -120,7 +120,7 @@ task packageJreDebian {
120120
if ("$arch" == "riscv64") {
121121
project.exec {
122122
workingDir "src/main/packaging"
123-
commandLine "docker", "build", "--no-cache",
123+
commandLine "docker", "build", "--no-cache", "--pull",
124124
"--build-arg", "IMAGE=riscv64/ubuntu:jammy",
125125
"-t", "adoptium-packages-linux-jdk-debian",
126126
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -132,7 +132,7 @@ task packageJreDebian {
132132
if ("$arch" != "armhf" && "$arch" != "riscv64"){
133133
project.exec {
134134
workingDir "src/main/packaging"
135-
commandLine "docker", "build", "--no-cache",
135+
commandLine "docker", "build", "--no-cache", "--pull",
136136
"-t", "adoptium-packages-linux-jdk-debian",
137137
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
138138
"-f", "Dockerfile",

‎linux/jre/redhat/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ task packageJreRedHat {
9797
if (gpgKey) {
9898
project.exec {
9999
workingDir "src/main/packaging"
100-
commandLine "docker", "build", "--no-cache",
100+
commandLine "docker", "build", "--no-cache", "--pull",
101101
"-t", "adoptium-packages-linux-jdk-redhat",
102102
"--secret", "id=gpg,src=${gpgKey}",
103103
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
@@ -107,7 +107,7 @@ task packageJreRedHat {
107107
} else {
108108
project.exec {
109109
workingDir "src/main/packaging"
110-
commandLine "docker", "build", "--no-cache",
110+
commandLine "docker", "build", "--no-cache", "--pull",
111111
"-t", "adoptium-packages-linux-jdk-redhat",
112112
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
113113
"-f", "Dockerfile",

0 commit comments

Comments
 (0)