Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handling registry for base image as ARG #18586

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

jayasg12
Copy link
Contributor

@jayasg12 jayasg12 commented Mar 7, 2025

  • Handling various repositories for base image
  • Tomcat version update

@jayasg12 jayasg12 requested a review from a team as a code owner March 7, 2025 10:31

This comment has been minimized.

@LaurentGoderre
Copy link
Member

The builds are failing because BASE_IMAGE=ubuntu:22.04 is missing the ARG

Copy link

github-actions bot commented Mar 7, 2025

Diff for 2043b2c:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b83e67a..d0fb76c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,190 +4,190 @@ GitFetch: refs/heads/ibm
 
 Tags: open-8u442-b06-jdk-focal, open-8-jdk-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 8/jdk/ubuntu/focal
 File: Dockerfile.open.releases.full
 
 Tags: open-8u442-b06-jdk-jammy, open-8-jdk-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 8/jdk/ubuntu/jammy
 File: Dockerfile.open.releases.full
 
 Tags: open-8u442-b06-jdk-noble, open-8-jdk-noble
 SharedTags: open-8u442-b06-jdk, open-8-jdk
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 8/jdk/ubuntu/noble
 File: Dockerfile.open.releases.full
 
 Tags: open-8u442-b06-jre-focal, open-8-jre-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 8/jre/ubuntu/focal
 File: Dockerfile.open.releases.full
 
 Tags: open-8u442-b06-jre-jammy, open-8-jre-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 8/jre/ubuntu/jammy
 File: Dockerfile.open.releases.full
 
 Tags: open-8u442-b06-jre-noble, open-8-jre-noble
 SharedTags: open-8u442-b06-jre, open-8-jre
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 8/jre/ubuntu/noble
 File: Dockerfile.open.releases.full
 
 Tags: open-11.0.26_4-jdk-focal, open-11-jdk-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 11/jdk/ubuntu/focal
 File: Dockerfile.open.releases.full
 
 Tags: open-11.0.26_4-jdk-jammy, open-11-jdk-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 11/jdk/ubuntu/jammy
 File: Dockerfile.open.releases.full
 
 Tags: open-11.0.26_4-jdk-noble, open-11-jdk-noble
 SharedTags: open-11.0.26_4-jdk, open-11-jdk
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 11/jdk/ubuntu/noble
 File: Dockerfile.open.releases.full
 
 Tags: open-11.0.26_4-jre-focal, open-11-jre-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 11/jre/ubuntu/focal
 File: Dockerfile.open.releases.full
 
 Tags: open-11.0.26_4-jre-jammy, open-11-jre-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 11/jre/ubuntu/jammy
 File: Dockerfile.open.releases.full
 
 Tags: open-11.0.26_4-jre-noble, open-11-jre-noble
 SharedTags: open-11.0.26_4-jre, open-11-jre
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 11/jre/ubuntu/noble
 File: Dockerfile.open.releases.full
 
 Tags: open-17.0.14_7-jdk-focal, open-17-jdk-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 17/jdk/ubuntu/focal
 File: Dockerfile.open.releases.full
 
 Tags: open-17.0.14_7-jdk-jammy, open-17-jdk-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 17/jdk/ubuntu/jammy
 File: Dockerfile.open.releases.full
 
 Tags: open-17.0.14_7-jdk-noble, open-17-jdk-noble
 SharedTags: open-17.0.14_7-jdk, open-17-jdk
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 17/jdk/ubuntu/noble
 File: Dockerfile.open.releases.full
 
 Tags: open-17.0.14_7-jre-focal, open-17-jre-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 17/jre/ubuntu/focal
 File: Dockerfile.open.releases.full
 
 Tags: open-17.0.14_7-jre-jammy, open-17-jre-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 17/jre/ubuntu/jammy
 File: Dockerfile.open.releases.full
 
 Tags: open-17.0.14_7-jre-noble, open-17-jre-noble
 SharedTags: open-17.0.14_7-jre, open-17-jre
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 17/jre/ubuntu/noble
 File: Dockerfile.open.releases.full
 
 Tags: open-21.0.6_7-jdk-focal, open-21-jdk-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 21/jdk/ubuntu/focal
 File: Dockerfile.open.releases.full
 
 Tags: open-21.0.6_7-jdk-jammy, open-21-jdk-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 21/jdk/ubuntu/jammy
 File: Dockerfile.open.releases.full
 
 Tags: open-21.0.6_7-jdk-noble, open-21-jdk-noble
 SharedTags: open-21.0.6_7-jdk, open-21-jdk
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 21/jdk/ubuntu/noble
 File: Dockerfile.open.releases.full
 
 Tags: open-21.0.6_7-jre-focal, open-21-jre-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 21/jre/ubuntu/focal
 File: Dockerfile.open.releases.full
 
 Tags: open-21.0.6_7-jre-jammy, open-21-jre-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 21/jre/ubuntu/jammy
 File: Dockerfile.open.releases.full
 
 Tags: open-21.0.6_7-jre-noble, open-21-jre-noble
 SharedTags: open-21.0.6_7-jre, open-21-jre
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 21/jre/ubuntu/noble
 File: Dockerfile.open.releases.full
 
 Tags: open-23.0.2_7-jdk-focal, open-23-jdk-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 23/jdk/ubuntu/focal
 File: Dockerfile.open.releases.full
 
 Tags: open-23.0.2_7-jdk-jammy, open-23-jdk-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 23/jdk/ubuntu/jammy
 File: Dockerfile.open.releases.full
 
 Tags: open-23.0.2_7-jdk-noble, open-23-jdk-noble
 SharedTags: open-23.0.2_7-jdk, open-23-jdk
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 23/jdk/ubuntu/noble
 File: Dockerfile.open.releases.full
 
 Tags: open-23.0.2_7-jre-focal, open-23-jre-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 23/jre/ubuntu/focal
 File: Dockerfile.open.releases.full
 
 Tags: open-23.0.2_7-jre-jammy, open-23-jre-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 23/jre/ubuntu/jammy
 File: Dockerfile.open.releases.full
 
 Tags: open-23.0.2_7-jre-noble, open-23-jre-noble
 SharedTags: open-23.0.2_7-jre, open-23-jre
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a278ee463c7dcda550133dccd661058a152df006
+GitCommit: 84ca03b712e3f51142fc458271b62e10bb9efa76
 Directory: 23/jre/ubuntu/noble
 File: Dockerfile.open.releases.full
diff --git a/ibm-semeru-runtimes_open-11-jdk-focal/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-11-jdk-focal/Dockerfile.open.releases.full
index 12a7963..306659c 100644
--- a/ibm-semeru-runtimes_open-11-jdk-focal/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-11-jdk-focal/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:20.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-11-jdk-jammy/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-11-jdk-jammy/Dockerfile.open.releases.full
index e46a51b..244c097 100644
--- a/ibm-semeru-runtimes_open-11-jdk-jammy/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-11-jdk-jammy/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:22.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:22.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-11-jdk-noble/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-11-jdk-noble/Dockerfile.open.releases.full
index d5eae75..d312b23 100644
--- a/ibm-semeru-runtimes_open-11-jdk-noble/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-11-jdk-noble/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:24.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:24.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-11-jre-focal/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-11-jre-focal/Dockerfile.open.releases.full
index a097943..8478c12 100644
--- a/ibm-semeru-runtimes_open-11-jre-focal/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-11-jre-focal/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:20.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-11-jre-jammy/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-11-jre-jammy/Dockerfile.open.releases.full
index 1bb39e9..92f85ef 100644
--- a/ibm-semeru-runtimes_open-11-jre-jammy/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-11-jre-jammy/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:22.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:22.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-11-jre-noble/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-11-jre-noble/Dockerfile.open.releases.full
index 63a9071..57e57aa 100644
--- a/ibm-semeru-runtimes_open-11-jre-noble/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-11-jre-noble/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:24.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:24.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-17-jdk-focal/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-17-jdk-focal/Dockerfile.open.releases.full
index 4e8aab5..a423ab4 100644
--- a/ibm-semeru-runtimes_open-17-jdk-focal/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-17-jdk-focal/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:20.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -72,8 +73,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-17-jdk-jammy/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-17-jdk-jammy/Dockerfile.open.releases.full
index 080b8c3..54dc28e 100644
--- a/ibm-semeru-runtimes_open-17-jdk-jammy/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-17-jdk-jammy/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:22.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:22.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-17-jdk-noble/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-17-jdk-noble/Dockerfile.open.releases.full
index e2ed842..1aec024 100644
--- a/ibm-semeru-runtimes_open-17-jdk-noble/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-17-jdk-noble/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:24.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:24.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-17-jre-focal/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-17-jre-focal/Dockerfile.open.releases.full
index 6b32850..e9698e2 100644
--- a/ibm-semeru-runtimes_open-17-jre-focal/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-17-jre-focal/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:20.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-17-jre-jammy/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-17-jre-jammy/Dockerfile.open.releases.full
index d7efc87..9ef38ec 100644
--- a/ibm-semeru-runtimes_open-17-jre-jammy/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-17-jre-jammy/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:22.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:22.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-17-jre-noble/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-17-jre-noble/Dockerfile.open.releases.full
index 0cb9531..36a17be 100644
--- a/ibm-semeru-runtimes_open-17-jre-noble/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-17-jre-noble/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:24.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:24.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-21-jdk-focal/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-21-jdk-focal/Dockerfile.open.releases.full
index aa0fdf4..4af80c5 100644
--- a/ibm-semeru-runtimes_open-21-jdk-focal/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-21-jdk-focal/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:20.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-21-jdk-jammy/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-21-jdk-jammy/Dockerfile.open.releases.full
index 24f14de..25b36eb 100644
--- a/ibm-semeru-runtimes_open-21-jdk-jammy/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-21-jdk-jammy/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:22.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:22.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-21-jdk-noble/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-21-jdk-noble/Dockerfile.open.releases.full
index 662cc3a..baee6d8 100644
--- a/ibm-semeru-runtimes_open-21-jdk-noble/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-21-jdk-noble/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:24.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:24.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-21-jre-focal/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-21-jre-focal/Dockerfile.open.releases.full
index 5e7dc75..bb13d93 100644
--- a/ibm-semeru-runtimes_open-21-jre-focal/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-21-jre-focal/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:20.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-21-jre-jammy/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-21-jre-jammy/Dockerfile.open.releases.full
index 09c268a..5de7053 100644
--- a/ibm-semeru-runtimes_open-21-jre-jammy/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-21-jre-jammy/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:22.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:22.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-21-jre-noble/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-21-jre-noble/Dockerfile.open.releases.full
index c0ac17b..ee56c02 100644
--- a/ibm-semeru-runtimes_open-21-jre-noble/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-21-jre-noble/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:24.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:24.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-23-jdk-focal/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-23-jdk-focal/Dockerfile.open.releases.full
index aec8d47..93b9e96 100644
--- a/ibm-semeru-runtimes_open-23-jdk-focal/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-23-jdk-focal/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2024
+# (C) Copyright IBM Corporation 2024, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:20.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-23-jdk-jammy/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-23-jdk-jammy/Dockerfile.open.releases.full
index bed4c95..a609f5e 100644
--- a/ibm-semeru-runtimes_open-23-jdk-jammy/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-23-jdk-jammy/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2024
+# (C) Copyright IBM Corporation 2024, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:22.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:22.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-23-jdk-noble/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-23-jdk-noble/Dockerfile.open.releases.full
index 90b5bd3..aeda7f6 100644
--- a/ibm-semeru-runtimes_open-23-jdk-noble/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-23-jdk-noble/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:24.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:24.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-23-jre-focal/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-23-jre-focal/Dockerfile.open.releases.full
index 7caad58..c2cf74c 100644
--- a/ibm-semeru-runtimes_open-23-jre-focal/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-23-jre-focal/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2024
+# (C) Copyright IBM Corporation 2024, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:20.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-23-jre-jammy/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-23-jre-jammy/Dockerfile.open.releases.full
index d076f47..a1786e6 100644
--- a/ibm-semeru-runtimes_open-23-jre-jammy/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-23-jre-jammy/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2024
+# (C) Copyright IBM Corporation 2024, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:22.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:22.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-23-jre-noble/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-23-jre-noble/Dockerfile.open.releases.full
index 02b3483..4c84306 100644
--- a/ibm-semeru-runtimes_open-23-jre-noble/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-23-jre-noble/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:24.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:24.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-8-jdk-focal/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-8-jdk-focal/Dockerfile.open.releases.full
index 79935b6..b26aedb 100644
--- a/ibm-semeru-runtimes_open-8-jdk-focal/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-8-jdk-focal/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:20.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -72,8 +73,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-8-jdk-jammy/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-8-jdk-jammy/Dockerfile.open.releases.full
index 83ef290..a56e8ce 100644
--- a/ibm-semeru-runtimes_open-8-jdk-jammy/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-8-jdk-jammy/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:22.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:22.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-8-jdk-noble/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-8-jdk-noble/Dockerfile.open.releases.full
index 411e612..dc381ca 100644
--- a/ibm-semeru-runtimes_open-8-jdk-noble/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-8-jdk-noble/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:24.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:24.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-8-jre-focal/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-8-jre-focal/Dockerfile.open.releases.full
index 3ac6b2c..e99d378 100644
--- a/ibm-semeru-runtimes_open-8-jre-focal/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-8-jre-focal/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:20.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-8-jre-jammy/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-8-jre-jammy/Dockerfile.open.releases.full
index 9e94aac..778f8f6 100644
--- a/ibm-semeru-runtimes_open-8-jre-jammy/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-8-jre-jammy/Dockerfile.open.releases.full
@@ -1,4 +1,4 @@
-# (C) Copyright IBM Corporation 2021, 2024
+# (C) Copyright IBM Corporation 2021, 2025
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:22.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:22.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \
diff --git a/ibm-semeru-runtimes_open-8-jre-noble/Dockerfile.open.releases.full b/ibm-semeru-runtimes_open-8-jre-noble/Dockerfile.open.releases.full
index 1468208..df4ae23 100644
--- a/ibm-semeru-runtimes_open-8-jre-noble/Dockerfile.open.releases.full
+++ b/ibm-semeru-runtimes_open-8-jre-noble/Dockerfile.open.releases.full
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 
-FROM ubuntu:24.04
+ARG REGISTRY=docker.io
+FROM ${REGISTRY:+${REGISTRY}/}ubuntu:24.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -71,8 +72,8 @@ RUN set -eux; \
     SCC_SIZE="50m"; \
     DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
     INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
-    TOMCAT_CHECKSUM="bf406b3e288e1732d82d08f54e160095451a6cc969f72adf395c074d6d08893ef1ccd2afcd55f01ca8e54131f587c88055832f36330a1ede0cc2f84440cf54df"; \
-    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99.tar.gz"; \
+    TOMCAT_CHECKSUM="cbe407f17c813d9f83cab459e603df171f2e5782c3a0cdb4cfa00b0391a89cedf865c6d8972fc7e12210c69a8467ede5939f35bb0f3b41fa173b9ee83199768a"; \
+    TOMCAT_DWNLD_URL="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.102/bin/apache-tomcat-9.0.102.tar.gz"; \
     \
     mkdir -p "${DOWNLOAD_PATH_TOMCAT}" "${INSTALL_PATH_TOMCAT}"; \
     curl -LfsSo "${DOWNLOAD_PATH_TOMCAT}"/tomcat.tar.gz "${TOMCAT_DWNLD_URL}"; \

Relevant Maintainers:

@tianon
Copy link
Member

tianon commented Mar 7, 2025

Unfortunately, our build system cannot reasonably support variadic FROM values because it needs to calculate the full image dependency tree.

@AdamBrousseau
Copy link

@tianon is there a mechanism to have the base image configurable at build time that is acceptable to DockerHub official builds? We're trying to avoid having multiple sets of Dockerfiles while allowing a use case where other users want to pull base images from other registry sites.

@tianon
Copy link
Member

tianon commented Mar 10, 2025

The best/simplest answer is docker buildx build --build-context: https://docs.docker.com/reference/cli/docker/buildx/build/#build-context (then users can even swap in totally different base images, although that will likely break the build in adorable ways)

Another way to handle this would be templates, but it sounds like that doesn't solve the use case you're targeting in a very obvious way (unless the users in question are OK with regenerating from the templates before building). It is kind of odd to have users explicitly building the images themselves though, not pulling them from somewhere else and building FROM them. 🤔

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants