Skip to content

Commit 6cdc449

Browse files
trasktrask
authored
Fix scorecard pinning issues (#15351)
1 parent 6e4e36e commit 6cdc449

13 files changed

+44
-28
lines changed

‎smoke-tests/images/servlet/build.gradle.kts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,10 @@ fun configureImage(
203203
throw GradleException("Unexpected vm: $vm")
204204
}
205205

206+
val jdkImageParts = jdkImage.split("@")
207+
val jdkImageName = jdkImageParts[0]
208+
val jdkImageHash = if (jdkImageParts.size > 1) jdkImageParts[1].removePrefix("sha256:") else ""
209+
206210
val extraArgs = args.toMutableMap()
207211
if (server == "wildfly") {
208212
// wildfly url without .zip or .tar.gz suffix
@@ -229,7 +233,7 @@ fun configureImage(
229233
inputDir.set(dockerWorkingDir)
230234
images.add(image)
231235
dockerFile.set(File(dockerWorkingDir.get().asFile, dockerFileName))
232-
buildArgs.set(extraArgs + mapOf("jdk" to jdk, "vm" to vm, "version" to version, "jdkImage" to jdkImage))
236+
buildArgs.set(extraArgs + mapOf("jdk" to jdk, "vm" to vm, "version" to version, "jdkImageName" to jdkImageName, "jdkImageHash" to jdkImageHash))
233237
doLast {
234238
matrix.add(image)
235239
}

‎smoke-tests/images/servlet/src/jetty.dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
ARG jdkImage
1+
ARG jdkImageName
2+
ARG jdkImageHash
23

34
# Unzip in a separate container so that zip file layer is not part of final image
4-
FROM ${jdkImage} as builder
5+
FROM ${jdkImageName}@sha256:${jdkImageHash} as builder
56
ARG sourceVersion
67

78
ADD https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${sourceVersion}/jetty-home-${sourceVersion}.tar.gz /server.tgz
89
RUN tar xf server.tgz && mv jetty-home-${sourceVersion} /server
910

10-
FROM ${jdkImage}
11+
FROM ${jdkImageName}@sha256:${jdkImageHash}
1112
COPY --from=builder /server /server
1213
ENV JETTY_HOME=/server
1314
ENV JETTY_BASE=/base

‎smoke-tests/images/servlet/src/jetty.windows.dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
ARG jdkImage
1+
ARG jdkImageName
2+
ARG jdkImageHash
23

34
# Unzip in a separate container so that zip file layer is not part of final image
45
FROM mcr.microsoft.com/windows/servercore:ltsc2022@sha256:3a2a2fdfbae2f720f6fe26f2d7680146712ce330f605b02a61d624889735c72e as builder
@@ -7,7 +8,7 @@ ARG sourceVersion
78
ADD https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${sourceVersion}/jetty-home-${sourceVersion}.zip /server.zip
89
RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]
910

10-
FROM ${jdkImage}
11+
FROM ${jdkImageName}@sha256:${jdkImageHash}
1112
ARG sourceVersion
1213

1314
# Make /server the base directory to simplify all further paths

‎smoke-tests/images/servlet/src/liberty.dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
ARG jdkImage
1+
ARG jdkImageName
2+
ARG jdkImageHash
23
ARG version
34

45
FROM open-liberty:${version}-full-java11-openj9 as liberty
56

6-
FROM ${jdkImage}
7+
FROM ${jdkImageName}@sha256:${jdkImageHash}
78

89
ENV CONFIG /config
910
ENV LIBERTY /opt/ol

‎smoke-tests/images/servlet/src/liberty.windows.dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
ARG jdkImage
1+
ARG jdkImageName
2+
ARG jdkImageHash
23

34
# Unzip in a separate container so that zip file layer is not part of final image
45
FROM mcr.microsoft.com/windows/servercore:ltsc2022@sha256:3a2a2fdfbae2f720f6fe26f2d7680146712ce330f605b02a61d624889735c72e as builder
@@ -8,7 +9,7 @@ ARG release
89
ADD https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/release/${release}/openliberty-${version}.zip /server.zip
910
RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]
1011

11-
FROM ${jdkImage}
12+
FROM ${jdkImageName}@sha256:${jdkImageHash}
1213

1314
# Make /server the base directory to simplify all further paths
1415
COPY --from=builder /server/wlp /server

‎smoke-tests/images/servlet/src/payara.dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
ARG jdkImage
1+
ARG jdkImageName
2+
ARG jdkImageHash
23
ARG version
34

45
FROM payara/server-full:${version} as builder
56

6-
FROM ${jdkImage}
7+
FROM ${jdkImageName}@sha256:${jdkImageHash}
78
ARG domainName
89

910
# These environment variables have been confirmed to work with 5.2020.6 only

‎smoke-tests/images/servlet/src/payara.windows.dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
ARG jdkImage
1+
ARG jdkImageName
2+
ARG jdkImageHash
23

34
# Unzip in a separate container so that zip file layer is not part of final image
45
FROM mcr.microsoft.com/windows/servercore:ltsc2022@sha256:3a2a2fdfbae2f720f6fe26f2d7680146712ce330f605b02a61d624889735c72e as builder
@@ -9,7 +10,7 @@ RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPat
910
RUN ["powershell", "-Command", "Get-ChildItem -Path /server/ -filter payara* | Rename-Item -NewName payara"]
1011
RUN ["powershell", "-Command", "remove-item -Path /server/payara/glassfish/modules/phonehome-bootstrap.jar"]
1112

12-
FROM ${jdkImage}
13+
FROM ${jdkImageName}@sha256:${jdkImageHash}
1314

1415
# Make /server the base directory to simplify all further paths
1516
COPY --from=builder /server/payara /server

‎smoke-tests/images/servlet/src/tomcat.dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
ARG jdkImage
1+
ARG jdkImageName
2+
ARG jdkImageHash
23
ARG version
34

45
# Unzip in a separate container so that zip file layer is not part of final image
5-
FROM ${jdkImage} as builder
6+
FROM ${jdkImageName}@sha256:${jdkImageHash} as builder
67
ARG majorVersion
78
ARG version
89

910
ADD https://archive.apache.org/dist/tomcat/tomcat-${majorVersion}/v${version}/bin/apache-tomcat-${version}.tar.gz /server.tgz
1011
RUN tar xf server.tgz && mv apache-tomcat-${version} /server && rm -rf /server/webapps && mkdir -p /server/webapps
1112

12-
FROM ${jdkImage}
13+
FROM ${jdkImageName}@sha256:${jdkImageHash}
1314
COPY --from=builder /server /server
1415

1516
WORKDIR /server/bin

‎smoke-tests/images/servlet/src/tomcat.windows.dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
ARG jdkImage
1+
ARG jdkImageName
2+
ARG jdkImageHash
23

34
# Unzip in a separate container so that zip file layer is not part of final image
45
FROM mcr.microsoft.com/windows/servercore:ltsc2022@sha256:3a2a2fdfbae2f720f6fe26f2d7680146712ce330f605b02a61d624889735c72e as builder
@@ -8,7 +9,7 @@ ARG version
89
ADD https://archive.apache.org/dist/tomcat/tomcat-${majorVersion}/v${version}/bin/apache-tomcat-${version}-windows-x64.zip /server.zip
910
RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]
1011

11-
FROM ${jdkImage}
12+
FROM ${jdkImageName}@sha256:${jdkImageHash}
1213
ARG version
1314

1415
# Make /server the base directory to simplify all further paths

‎smoke-tests/images/servlet/src/tomee.dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
ARG jdkImage
1+
ARG jdkImageName
2+
ARG jdkImageHash
23

34
# Unzip in a separate container so that zip file layer is not part of final image
4-
FROM ${jdkImage} as builder
5+
FROM ${jdkImageName}@sha256:${jdkImageHash} as builder
56
ARG version
67

78
ADD https://archive.apache.org/dist/tomee/tomee-${version}/apache-tomee-${version}-webprofile.tar.gz /server.tgz
89
RUN tar xf server.tgz && ls -al / && mv apache-tomee-webprofile-${version} /server
910

10-
FROM ${jdkImage}
11+
FROM ${jdkImageName}@sha256:${jdkImageHash}
1112
COPY --from=builder /server /server
1213

1314
WORKDIR /server/bin

0 commit comments

Comments
 (0)