Resolved merge conflict by incorporating both suggestions.

.ci/publish.sh

@@ -71,6 +71,7 @@ publish() {
     export JENKINS_SHA=$sha
     export LATEST_WEEKLY=$latest_weekly
     export LATEST_LTS=$latest_lts
+    export COMMIT_SHA=$(git rev-parse HEAD)
     set -x
     docker buildx bake --file docker-bake.hcl \
                  "${build_opts[@]+"${build_opts[@]}"}" linux

11/almalinux/almalinux8/hotspot/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.12_7-jdk-centos7 as jre-build
+FROM eclipse-temurin:11.0.13_8-jdk-centos7 as jre-build
 
 # Generate smaller java runtime without unneeded files
 # for now we include the full module path to maintain compatibility
@@ -14,6 +14,7 @@ FROM almalinux:8.4
 ENV LANG C.UTF-8
 
 ARG TARGETARCH
+ARG COMMIT_SHA
 
 RUN dnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install -y \
 	fontconfig \
@@ -118,4 +119,5 @@ LABEL \
     org.opencontainers.image.version="${JENKINS_VERSION}" \
     org.opencontainers.image.url="https://www.jenkins.io/" \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" \
+    org.opencontainers.image.revision="${COMMIT_SHA}" \
     org.opencontainers.image.licenses="MIT"

11/alpine/hotspot/Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.12_7-alpine AS jre-build
+FROM adoptopenjdk/openjdk11:jdk-11.0.13_8-alpine AS jre-build
 
 # Generate smaller java runtime without unneeded files
 # for now we include the full module path to maintain compatibility
@@ -28,7 +28,8 @@ RUN apk add --no-cache \
 ENV LANG C.UTF-8
 
 ARG TARGETARCH
-ARG GIT_LFS_VERSION=3.0.1
+ARG COMMIT_SHA
+ARG GIT_LFS_VERSION=3.0.2
 
 # required for multi-arch support, revert to package cloud after:
 # https://github.com/git-lfs/git-lfs/issues/4546
@@ -166,4 +167,5 @@ LABEL \
     org.opencontainers.image.version="${JENKINS_VERSION}" \
     org.opencontainers.image.url="https://www.jenkins.io/" \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" \
+    org.opencontainers.image.revision="${COMMIT_SHA}" \
     org.opencontainers.image.licenses="MIT"

11/centos/centos7/hotspot/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.12_7-jdk-centos7 as jre-build
+FROM eclipse-temurin:11.0.13_8-jdk-centos7 as jre-build
 
 # Generate smaller java runtime without unneeded files
 # for now we include the full module path to maintain compatibility
@@ -14,12 +14,14 @@ FROM centos:centos7.9.2009
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 ARG TARGETARCH
+ARG COMMIT_SHA
 
 RUN yum install -y git curl freetype fontconfig unzip which && \
     yum clean all
 
 ARG TARGETARCH
-ARG GIT_LFS_VERSION=3.0.1
+ARG COMMIT_SHA
+ARG GIT_LFS_VERSION=3.0.2
 
 # required for multi-arch support, revert to package cloud after:
 # https://github.com/git-lfs/git-lfs/issues/4546
@@ -131,4 +133,5 @@ LABEL \
     org.opencontainers.image.version="${JENKINS_VERSION}" \
     org.opencontainers.image.url="https://www.jenkins.io/" \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" \
+    org.opencontainers.image.revision="${COMMIT_SHA}" \
     org.opencontainers.image.licenses="MIT"

11/debian/bullseye-slim/hotspot/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.12_7-jdk-focal as jre-build
+FROM eclipse-temurin:11.0.13_8-jdk-focal as jre-build
 
 RUN jlink \
          --add-modules ALL-MODULE-PATH \
@@ -17,7 +17,8 @@ RUN apt-get update && \
 ENV LANG C.UTF-8
 
 ARG TARGETARCH
-ARG GIT_LFS_VERSION=3.0.1
+ARG COMMIT_SHA
+ARG GIT_LFS_VERSION=3.0.2
 
 # required for multi-arch support, revert to package cloud after:
 # https://github.com/git-lfs/git-lfs/issues/4546
@@ -129,4 +130,5 @@ LABEL \
     org.opencontainers.image.version="${JENKINS_VERSION}" \
     org.opencontainers.image.url="https://www.jenkins.io/" \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" \
+    org.opencontainers.image.revision="${COMMIT_SHA}" \
     org.opencontainers.image.licenses="MIT"

11/debian/bullseye/hotspot/Dockerfile

@@ -1,12 +1,12 @@
-FROM eclipse-temurin:11.0.12_7-jdk-focal as jre-build
+FROM eclipse-temurin:11.0.13_8-jdk-focal as jre-build
 
 RUN jlink \
          --add-modules ALL-MODULE-PATH \
          --no-man-pages \
          --compress=2 \
          --output /javaruntime
 
-FROM debian:bullseye-20210927
+FROM debian:bullseye-20211011
 
 RUN apt-get update && \
     apt-get install -y git curl gpg unzip libfreetype6 libfontconfig1 && \
@@ -15,7 +15,8 @@ RUN apt-get update && \
 ENV LANG C.UTF-8
 
 ARG TARGETARCH
-ARG GIT_LFS_VERSION=3.0.1
+ARG COMMIT_SHA
+ARG GIT_LFS_VERSION=3.0.2
 
 # required for multi-arch support, revert to package cloud after:
 # https://github.com/git-lfs/git-lfs/issues/4546
@@ -127,4 +128,5 @@ LABEL \
     org.opencontainers.image.version="${JENKINS_VERSION}" \
     org.opencontainers.image.url="https://www.jenkins.io/" \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" \
+    org.opencontainers.image.revision="${COMMIT_SHA}" \
     org.opencontainers.image.licenses="MIT"

11/rhel/ubi8/hotspot/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.12_7-jdk-centos7 as jre-build
+FROM eclipse-temurin:11.0.13_8-jdk-centos7 as jre-build
 
 # Generate smaller java runtime without unneeded files
 # for now we include the full module path to maintain compatibility
@@ -9,11 +9,12 @@ RUN jlink \
          --compress=2 \
          --output /javaruntime
 
-FROM registry.access.redhat.com/ubi8/ubi:8.4-211
+FROM registry.access.redhat.com/ubi8/ubi:8.4-213
 
 ENV LANG C.UTF-8
 
 ARG TARGETARCH
+ARG COMMIT_SHA
 
 RUN dnf install --disableplugin=subscription-manager --setopt=install_weak_deps=0 --setopt=tsflags=nodocs -y \
         git \
@@ -121,4 +122,5 @@ LABEL \
     org.opencontainers.image.version="${JENKINS_VERSION}" \
     org.opencontainers.image.url="https://www.jenkins.io/" \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" \
+    org.opencontainers.image.revision="${COMMIT_SHA}" \
     org.opencontainers.image.licenses="MIT"

11/windows/windowsservercore-2019/hotspot/Dockerfile

@@ -6,6 +6,8 @@ ARG http_port=8080
 ARG agent_port=50000
 ARG JENKINS_HOME=C:/ProgramData/Jenkins/JenkinsHome
 
+ARG COMMIT_SHA
+
 ENV JENKINS_HOME $JENKINS_HOME
 ENV JENKINS_AGENT_PORT ${agent_port}
 
@@ -79,4 +81,5 @@ LABEL `
     org.opencontainers.image.version="${JENKINS_VERSION}" `
     org.opencontainers.image.url="https://www.jenkins.io/" `
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" `
+    org.opencontainers.image.revision="${COMMIT_SHA}" `
     org.opencontainers.image.licenses="MIT"

17/debian/bullseye/hotspot/Dockerfile

@@ -15,7 +15,8 @@ RUN apt-get update && \
 ENV LANG C.UTF-8
 
 ARG TARGETARCH
-ARG GIT_LFS_VERSION=3.0.1
+ARG COMMIT_SHA
+ARG GIT_LFS_VERSION=3.0.2
 
 # required for multi-arch support, revert to package cloud after:
 # https://github.com/git-lfs/git-lfs/issues/4546
@@ -128,4 +129,5 @@ LABEL \
     org.opencontainers.image.version="${JENKINS_VERSION}" \
     org.opencontainers.image.url="https://www.jenkins.io/" \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" \
+    org.opencontainers.image.revision="${COMMIT_SHA}" \
     org.opencontainers.image.licenses="MIT"

8/alpine/hotspot/Dockerfile

@@ -1,7 +1,7 @@
 # FIXME(oleg_nenashev): This is not an official AdoptOpenJDK Docker Image.
 # There is no official Alpine images at the moment.
 # Needs upgrade when/if there is an official alpine image.
-FROM adoptopenjdk/openjdk8:jdk8u302-b08-alpine
+FROM adoptopenjdk/openjdk8:jdk8u312-b07-alpine
 
 RUN apk add --no-cache \
   bash \
@@ -18,7 +18,8 @@ RUN apk add --no-cache \
 ENV LANG C.UTF-8
 
 ARG TARGETARCH
-ARG GIT_LFS_VERSION=3.0.1
+ARG COMMIT_SHA
+ARG GIT_LFS_VERSION=3.0.2
 
 # required for multi-arch support, revert to package cloud after:
 # https://github.com/git-lfs/git-lfs/issues/4546
@@ -116,4 +117,5 @@ LABEL \
     org.opencontainers.image.version="${JENKINS_VERSION}" \
     org.opencontainers.image.url="https://www.jenkins.io/" \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" \
+    org.opencontainers.image.revision="${COMMIT_SHA}" \
     org.opencontainers.image.licenses="MIT"

8/centos/centos7/hotspot/Dockerfile

@@ -3,6 +3,7 @@ FROM centos:centos7.9.2009
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 ARG TARGETARCH
+ARG COMMIT_SHA
 
 RUN echo -e '[AdoptOpenJDK]\n\
 name=AdoptOpenJDK\n\
@@ -14,7 +15,8 @@ gpgkey=https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public' > /etc/yum
     yum clean all
 
 ARG TARGETARCH
-ARG GIT_LFS_VERSION=3.0.1
+ARG COMMIT_SHA
+ARG GIT_LFS_VERSION=3.0.2
 
 # required for multi-arch support, revert to package cloud after:
 # https://github.com/git-lfs/git-lfs/issues/4546
@@ -122,4 +124,5 @@ LABEL \
     org.opencontainers.image.version="${JENKINS_VERSION}" \
     org.opencontainers.image.url="https://www.jenkins.io/" \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" \
+    org.opencontainers.image.revision="${COMMIT_SHA}" \
     org.opencontainers.image.licenses="MIT"

8/debian/bullseye-slim/hotspot/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:8u302-b08-jdk-focal as jre-build
+FROM eclipse-temurin:8u312-b07-jdk-focal as jre-build
 
 FROM debian:bullseye-20211011-slim
 
@@ -9,7 +9,8 @@ RUN apt-get update && \
 ENV LANG C.UTF-8
 
 ARG TARGETARCH
-ARG GIT_LFS_VERSION=3.0.1
+ARG COMMIT_SHA
+ARG GIT_LFS_VERSION=3.0.2
 
 # required for multi-arch support, revert to package cloud after:
 # https://github.com/git-lfs/git-lfs/issues/4546
@@ -121,4 +122,5 @@ LABEL \
     org.opencontainers.image.version="${JENKINS_VERSION}" \
     org.opencontainers.image.url="https://www.jenkins.io/" \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" \
+    org.opencontainers.image.revision="${COMMIT_SHA}" \
     org.opencontainers.image.licenses="MIT"

8/debian/bullseye/hotspot/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:8u302-b08-jdk-focal as jre-build
+FROM eclipse-temurin:8u312-b07-jdk-focal as jre-build
 
 FROM debian:bullseye-20211011
 
@@ -9,7 +9,8 @@ RUN apt-get update && \
 ENV LANG C.UTF-8
 
 ARG TARGETARCH
-ARG GIT_LFS_VERSION=3.0.1
+ARG COMMIT_SHA
+ARG GIT_LFS_VERSION=3.0.2
 
 # required for multi-arch support, revert to package cloud after:
 # https://github.com/git-lfs/git-lfs/issues/4546
@@ -121,4 +122,5 @@ LABEL \
     org.opencontainers.image.version="${JENKINS_VERSION}" \
     org.opencontainers.image.url="https://www.jenkins.io/" \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker" \
+    org.opencontainers.image.revision="${COMMIT_SHA}" \
     org.opencontainers.image.licenses="MIT"

Jenkinsfile

@@ -14,7 +14,7 @@ properties(listOfProperties)
 stage('Build') {
     def builds = [:]
     builds['windows'] = {
-        nodeWithTimeout('windock') {
+        nodeWithTimeout('docker-windows') {
             stage('Checkout') {
                 checkout scm
             }

Makefile

@@ -6,6 +6,8 @@ export DOCKER_BUILDKIT=1
 export DOCKER_CLI_EXPERIMENTAL=enabled
 ## Required to have docker build output always printed on stdout
 export BUILDKIT_PROGRESS=plain
+## Required to have the commit SHA added as a Docker image label
+export COMMIT_SHA=$(shell git rev-parse HEAD)
 
 current_arch := $(shell uname -m)
 export ARCH ?= $(shell case $(current_arch) in (x86_64) echo "amd64" ;; (i386) echo "386";; (aarch64|arm64) echo "arm64" ;; (armv6*) echo "arm/v6";; (armv7*) echo "arm/v7";; (ppc64*|s390*|riscv*) echo $(current_arch);; (*) echo "UNKNOWN-CPU";; esac)