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.

Sign up for GitHub

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

Jump to bottom

Update SapMachine January 2025 #18305

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Update SapMachine January 2025 #18305

merged 2 commits into from
Jan 27, 2025

Conversation

RealCLanger
Copy link
Contributor

This updates SapMachine containers to the January 2025 update cycles.
It also adds container flavors for Alpine base images.
There's also a change in the responsible maintainers.

@RealCLanger RealCLanger requested a review from a team as a code owner January 24, 2025 15:37
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@tianon
Copy link
Member

tianon commented Jan 24, 2025 

+RUN wget -qO /etc/apk/keys/sapmachine-apk.rsa.pub https://dist.sapmachine.io/alpine/sapmachine-apk.rsa.pub \

Unfortunately, this needs some kind of verification beyond just https (sha256 checksum, etc). 🙈

@yosifkit
Copy link
Member 

+RUN wget -qO /etc/apk/keys/sapmachine-apk.rsa.pub https://dist.sapmachine.io/alpine/sapmachine-apk.rsa.pub \
+    && echo "https://dist.sapmachine.io/alpine" >> /etc/apk/repositories \
+    && apk add sapmachine-17-jdk=17.0.14-r0

https://github.com/docker-library/official-images/blob/c3f2c2303685ddc3d8c0a1800568f2d171ad6924/README.md#image-build

Can you add some verification of the key download in the Alpine images? Either an embedded SHA check ( echo "[insert shasum] *sapmachine-apk.rsa.pub" | sha256sum --strict -c) or fetching via gpg like the Ubuntu images. The embedded checksum will also help provide a natural cache bust when the key is updated for expiration, for example.

@yosifkit
Copy link
Member 

warning: using 'sapmachine:latest' instead of 'sapmachine:17-jdk-alpine' (results may vary!)
Error: LinkageError occurred while loading main class container
	java.lang.UnsupportedClassVersionError: container has been compiled by a more recent version of the Java Runtime (class file version 67.0), this version of the Java Runtime only recognizes class file versions up to 61.0
	'java-hello-world' [4/5]...failed
warning: using 'sapmachine:latest' instead of 'sapmachine:17-jdk-alpine' (results may vary!)
Error: LinkageError occurred while loading main class container
	java.lang.UnsupportedClassVersionError: container has been compiled by a more recent version of the Java Runtime (class file version 67.0), this version of the Java Runtime only recognizes class file versions up to 61.0
	'java-ca-certificates' [5/5]...failed

These *-jre-alpine build failures are an expected gap in our testing and can be ignored for this PR.

@tianon tianon mentioned this pull request Jan 24, 2025
Merged
@tianon
Copy link
Member

tianon commented Jan 24, 2025

These *-jre-alpine build failures are an expected gap in our testing and can be ignored for this PR.

This has been improved somewhat in #18309 such that a rebase (esp. with the change requested above) should fix the CI failure 🤞

@github-actions GitHub Actions
Copy link

Diff for 1444d36: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bf13f8f..e3a1961 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,242 +1,266 @@
-Maintainers: Christoph Langer <sapmachine@sap.com> (@realclanger), Christian Halstrick <sapmachine@sap.com> (@chalstrick)
+Maintainers: Christoph Langer <sapmachine@sap.com> (@realclanger), Arno Zeller <sapmachine@sap.com> (@ArnoZeller)
 GitRepo: https://github.com/SAP/SapMachine-infrastructure.git
 
-Tags: 11, 11-jdk-ubuntu, 11.0.25, 11.0.25-jdk-ubuntu, 11-ubuntu-noble, 11-ubuntu-24.04, 11.0.25-ubuntu-noble, 11.0.25-ubuntu-24.04, 11-jdk-ubuntu-noble, 11-jdk-ubuntu-24.04, 11.0.25-jdk-ubuntu-noble, 11.0.25-jdk-ubuntu-24.04
+Tags: 11, 11-jdk-ubuntu, 11.0.26, 11.0.26-jdk-ubuntu, 11-ubuntu-noble, 11-ubuntu-24.04, 11.0.26-ubuntu-noble, 11.0.26-ubuntu-24.04, 11-jdk-ubuntu-noble, 11-jdk-ubuntu-24.04, 11.0.26-jdk-ubuntu-noble, 11.0.26-jdk-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/24_04/jdk
 
-Tags: 11-jdk-headless-ubuntu, 11.0.25-jdk-headless-ubuntu, 11-jdk-headless-ubuntu-noble, 11-jdk-headless-ubuntu-24.04, 11.0.25-jdk-headless-ubuntu-noble, 11.0.25-jdk-headless-ubuntu-24.04
+Tags: 11-jdk-headless-ubuntu, 11.0.26-jdk-headless-ubuntu, 11-jdk-headless-ubuntu-noble, 11-jdk-headless-ubuntu-24.04, 11.0.26-jdk-headless-ubuntu-noble, 11.0.26-jdk-headless-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/24_04/jdk-headless
 
-Tags: 11-jdk-headless-ubuntu-focal, 11-jdk-headless-ubuntu-20.04, 11.0.25-jdk-headless-ubuntu-focal, 11.0.25-jdk-headless-ubuntu-20.04
+Tags: 11-jdk-headless-ubuntu-focal, 11-jdk-headless-ubuntu-20.04, 11.0.26-jdk-headless-ubuntu-focal, 11.0.26-jdk-headless-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/20_04/jdk-headless
 
-Tags: 11-jdk-headless-ubuntu-jammy, 11-jdk-headless-ubuntu-22.04, 11.0.25-jdk-headless-ubuntu-jammy, 11.0.25-jdk-headless-ubuntu-22.04
+Tags: 11-jdk-headless-ubuntu-jammy, 11-jdk-headless-ubuntu-22.04, 11.0.26-jdk-headless-ubuntu-jammy, 11.0.26-jdk-headless-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/22_04/jdk-headless
 
-Tags: 11-jre-headless-ubuntu, 11.0.25-jre-headless-ubuntu, 11-jre-headless-ubuntu-noble, 11-jre-headless-ubuntu-24.04, 11.0.25-jre-headless-ubuntu-noble, 11.0.25-jre-headless-ubuntu-24.04
+Tags: 11-jre-headless-ubuntu, 11.0.26-jre-headless-ubuntu, 11-jre-headless-ubuntu-noble, 11-jre-headless-ubuntu-24.04, 11.0.26-jre-headless-ubuntu-noble, 11.0.26-jre-headless-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/24_04/jre-headless
 
-Tags: 11-jre-headless-ubuntu-focal, 11-jre-headless-ubuntu-20.04, 11.0.25-jre-headless-ubuntu-focal, 11.0.25-jre-headless-ubuntu-20.04
+Tags: 11-jre-headless-ubuntu-focal, 11-jre-headless-ubuntu-20.04, 11.0.26-jre-headless-ubuntu-focal, 11.0.26-jre-headless-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/20_04/jre-headless
 
-Tags: 11-jre-headless-ubuntu-jammy, 11-jre-headless-ubuntu-22.04, 11.0.25-jre-headless-ubuntu-jammy, 11.0.25-jre-headless-ubuntu-22.04
+Tags: 11-jre-headless-ubuntu-jammy, 11-jre-headless-ubuntu-22.04, 11.0.26-jre-headless-ubuntu-jammy, 11.0.26-jre-headless-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/22_04/jre-headless
 
-Tags: 11-jre-ubuntu, 11.0.25-jre-ubuntu, 11-jre-ubuntu-noble, 11-jre-ubuntu-24.04, 11.0.25-jre-ubuntu-noble, 11.0.25-jre-ubuntu-24.04
+Tags: 11-jre-ubuntu, 11.0.26-jre-ubuntu, 11-jre-ubuntu-noble, 11-jre-ubuntu-24.04, 11.0.26-jre-ubuntu-noble, 11.0.26-jre-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/24_04/jre
 
-Tags: 11-jre-ubuntu-focal, 11-jre-ubuntu-20.04, 11.0.25-jre-ubuntu-focal, 11.0.25-jre-ubuntu-20.04
+Tags: 11-jre-ubuntu-focal, 11-jre-ubuntu-20.04, 11.0.26-jre-ubuntu-focal, 11.0.26-jre-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/20_04/jre
 
-Tags: 11-jre-ubuntu-jammy, 11-jre-ubuntu-22.04, 11.0.25-jre-ubuntu-jammy, 11.0.25-jre-ubuntu-22.04
+Tags: 11-jre-ubuntu-jammy, 11-jre-ubuntu-22.04, 11.0.26-jre-ubuntu-jammy, 11.0.26-jre-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/22_04/jre
 
-Tags: 11-ubuntu-focal, 11-ubuntu-20.04, 11.0.25-ubuntu-focal, 11.0.25-ubuntu-20.04, 11-jdk-ubuntu-focal, 11-jdk-ubuntu-20.04, 11.0.25-jdk-ubuntu-focal, 11.0.25-jdk-ubuntu-20.04
+Tags: 11-ubuntu-focal, 11-ubuntu-20.04, 11.0.26-ubuntu-focal, 11.0.26-ubuntu-20.04, 11-jdk-ubuntu-focal, 11-jdk-ubuntu-20.04, 11.0.26-jdk-ubuntu-focal, 11.0.26-jdk-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/20_04/jdk
 
-Tags: 11-ubuntu-jammy, 11-ubuntu-22.04, 11.0.25-ubuntu-jammy, 11.0.25-ubuntu-22.04, 11-jdk-ubuntu-jammy, 11-jdk-ubuntu-22.04, 11.0.25-jdk-ubuntu-jammy, 11.0.25-jdk-ubuntu-22.04
+Tags: 11-ubuntu-jammy, 11-ubuntu-22.04, 11.0.26-ubuntu-jammy, 11.0.26-ubuntu-22.04, 11-jdk-ubuntu-jammy, 11-jdk-ubuntu-22.04, 11.0.26-jdk-ubuntu-jammy, 11.0.26-jdk-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 74f392cfc725505f1c49bff08a4e37c9bdb9b8c0
+GitCommit: 29fb3d840b5725460aeb66af135c70fc5a62a249
 Directory: dockerfiles/11/ubuntu/22_04/jdk
 
-Tags: 17, 17-jdk-ubuntu, 17.0.13, 17.0.13-jdk-ubuntu, 17-ubuntu-noble, 17-ubuntu-24.04, 17.0.13-ubuntu-noble, 17.0.13-ubuntu-24.04, 17-jdk-ubuntu-noble, 17-jdk-ubuntu-24.04, 17.0.13-jdk-ubuntu-noble, 17.0.13-jdk-ubuntu-24.04
+Tags: 17, 17-jdk-ubuntu, 17.0.14, 17.0.14-jdk-ubuntu, 17-ubuntu-noble, 17-ubuntu-24.04, 17.0.14-ubuntu-noble, 17.0.14-ubuntu-24.04, 17-jdk-ubuntu-noble, 17-jdk-ubuntu-24.04, 17.0.14-jdk-ubuntu-noble, 17.0.14-jdk-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/24_04/jdk
 
-Tags: 17-jdk-headless-ubuntu, 17.0.13-jdk-headless-ubuntu, 17-jdk-headless-ubuntu-noble, 17-jdk-headless-ubuntu-24.04, 17.0.13-jdk-headless-ubuntu-noble, 17.0.13-jdk-headless-ubuntu-24.04
+Tags: 17-jdk-alpine, 17.0.14-jdk-alpine, 17-alpine-3.21, 17.0.14-alpine-3.21, 17-jdk-alpine-3.21, 17.0.14-jdk-alpine-3.21
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
+Directory: dockerfiles/17/alpine/3_21/jdk
+
+Tags: 17-jdk-headless-ubuntu, 17.0.14-jdk-headless-ubuntu, 17-jdk-headless-ubuntu-noble, 17-jdk-headless-ubuntu-24.04, 17.0.14-jdk-headless-ubuntu-noble, 17.0.14-jdk-headless-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/24_04/jdk-headless
 
-Tags: 17-jdk-headless-ubuntu-focal, 17-jdk-headless-ubuntu-20.04, 17.0.13-jdk-headless-ubuntu-focal, 17.0.13-jdk-headless-ubuntu-20.04
+Tags: 17-jdk-headless-ubuntu-focal, 17-jdk-headless-ubuntu-20.04, 17.0.14-jdk-headless-ubuntu-focal, 17.0.14-jdk-headless-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/20_04/jdk-headless
 
-Tags: 17-jdk-headless-ubuntu-jammy, 17-jdk-headless-ubuntu-22.04, 17.0.13-jdk-headless-ubuntu-jammy, 17.0.13-jdk-headless-ubuntu-22.04
+Tags: 17-jdk-headless-ubuntu-jammy, 17-jdk-headless-ubuntu-22.04, 17.0.14-jdk-headless-ubuntu-jammy, 17.0.14-jdk-headless-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/22_04/jdk-headless
 
-Tags: 17-jre-headless-ubuntu, 17.0.13-jre-headless-ubuntu, 17-jre-headless-ubuntu-noble, 17-jre-headless-ubuntu-24.04, 17.0.13-jre-headless-ubuntu-noble, 17.0.13-jre-headless-ubuntu-24.04
+Tags: 17-jre-alpine, 17.0.14-jre-alpine, 17-jre-alpine-3.21, 17.0.14-jre-alpine-3.21
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
+Directory: dockerfiles/17/alpine/3_21/jre
+
+Tags: 17-jre-headless-ubuntu, 17.0.14-jre-headless-ubuntu, 17-jre-headless-ubuntu-noble, 17-jre-headless-ubuntu-24.04, 17.0.14-jre-headless-ubuntu-noble, 17.0.14-jre-headless-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/24_04/jre-headless
 
-Tags: 17-jre-headless-ubuntu-focal, 17-jre-headless-ubuntu-20.04, 17.0.13-jre-headless-ubuntu-focal, 17.0.13-jre-headless-ubuntu-20.04
+Tags: 17-jre-headless-ubuntu-focal, 17-jre-headless-ubuntu-20.04, 17.0.14-jre-headless-ubuntu-focal, 17.0.14-jre-headless-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/20_04/jre-headless
 
-Tags: 17-jre-headless-ubuntu-jammy, 17-jre-headless-ubuntu-22.04, 17.0.13-jre-headless-ubuntu-jammy, 17.0.13-jre-headless-ubuntu-22.04
+Tags: 17-jre-headless-ubuntu-jammy, 17-jre-headless-ubuntu-22.04, 17.0.14-jre-headless-ubuntu-jammy, 17.0.14-jre-headless-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/22_04/jre-headless
 
-Tags: 17-jre-ubuntu, 17.0.13-jre-ubuntu, 17-jre-ubuntu-noble, 17-jre-ubuntu-24.04, 17.0.13-jre-ubuntu-noble, 17.0.13-jre-ubuntu-24.04
+Tags: 17-jre-ubuntu, 17.0.14-jre-ubuntu, 17-jre-ubuntu-noble, 17-jre-ubuntu-24.04, 17.0.14-jre-ubuntu-noble, 17.0.14-jre-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/24_04/jre
 
-Tags: 17-jre-ubuntu-focal, 17-jre-ubuntu-20.04, 17.0.13-jre-ubuntu-focal, 17.0.13-jre-ubuntu-20.04
+Tags: 17-jre-ubuntu-focal, 17-jre-ubuntu-20.04, 17.0.14-jre-ubuntu-focal, 17.0.14-jre-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/20_04/jre
 
-Tags: 17-jre-ubuntu-jammy, 17-jre-ubuntu-22.04, 17.0.13-jre-ubuntu-jammy, 17.0.13-jre-ubuntu-22.04
+Tags: 17-jre-ubuntu-jammy, 17-jre-ubuntu-22.04, 17.0.14-jre-ubuntu-jammy, 17.0.14-jre-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/22_04/jre
 
-Tags: 17-ubuntu-focal, 17-ubuntu-20.04, 17.0.13-ubuntu-focal, 17.0.13-ubuntu-20.04, 17-jdk-ubuntu-focal, 17-jdk-ubuntu-20.04, 17.0.13-jdk-ubuntu-focal, 17.0.13-jdk-ubuntu-20.04
+Tags: 17-ubuntu-focal, 17-ubuntu-20.04, 17.0.14-ubuntu-focal, 17.0.14-ubuntu-20.04, 17-jdk-ubuntu-focal, 17-jdk-ubuntu-20.04, 17.0.14-jdk-ubuntu-focal, 17.0.14-jdk-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/20_04/jdk
 
-Tags: 17-ubuntu-jammy, 17-ubuntu-22.04, 17.0.13-ubuntu-jammy, 17.0.13-ubuntu-22.04, 17-jdk-ubuntu-jammy, 17-jdk-ubuntu-22.04, 17.0.13-jdk-ubuntu-jammy, 17.0.13-jdk-ubuntu-22.04
+Tags: 17-ubuntu-jammy, 17-ubuntu-22.04, 17.0.14-ubuntu-jammy, 17.0.14-ubuntu-22.04, 17-jdk-ubuntu-jammy, 17-jdk-ubuntu-22.04, 17.0.14-jdk-ubuntu-jammy, 17.0.14-jdk-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fd88009fc782ba7b919680ba995d749db2f5e364
+GitCommit: 29476b9382690e538a1326c1479700be1fc70b62
 Directory: dockerfiles/17/ubuntu/22_04/jdk
 
-Tags: 21, lts, 21-jdk-ubuntu, lts-jdk-ubuntu, 21.0.5, 21.0.5-jdk-ubuntu, 21-ubuntu-noble, 21-ubuntu-24.04, lts-ubuntu-noble, lts-ubuntu-24.04, 21.0.5-ubuntu-noble, 21.0.5-ubuntu-24.04, 21-jdk-ubuntu-noble, 21-jdk-ubuntu-24.04, lts-jdk-ubuntu-noble, lts-jdk-ubuntu-24.04, 21.0.5-jdk-ubuntu-noble, 21.0.5-jdk-ubuntu-24.04
+Tags: 21, lts, 21-jdk-ubuntu, lts-jdk-ubuntu, 21.0.6, 21.0.6-jdk-ubuntu, 21-ubuntu-noble, 21-ubuntu-24.04, lts-ubuntu-noble, lts-ubuntu-24.04, 21.0.6-ubuntu-noble, 21.0.6-ubuntu-24.04, 21-jdk-ubuntu-noble, 21-jdk-ubuntu-24.04, lts-jdk-ubuntu-noble, lts-jdk-ubuntu-24.04, 21.0.6-jdk-ubuntu-noble, 21.0.6-jdk-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/24_04/jdk
 
-Tags: 21-jdk-headless-ubuntu, lts-jdk-headless-ubuntu, 21.0.5-jdk-headless-ubuntu, 21-jdk-headless-ubuntu-noble, 21-jdk-headless-ubuntu-24.04, lts-jdk-headless-ubuntu-noble, lts-jdk-headless-ubuntu-24.04, 21.0.5-jdk-headless-ubuntu-noble, 21.0.5-jdk-headless-ubuntu-24.04
+Tags: 21-jdk-alpine, lts-jdk-alpine, 21.0.6-jdk-alpine, 21-alpine-3.21, lts-alpine-3.21, 21.0.6-alpine-3.21, 21-jdk-alpine-3.21, lts-jdk-alpine-3.21, 21.0.6-jdk-alpine-3.21
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
+Directory: dockerfiles/21/alpine/3_21/jdk
+
+Tags: 21-jdk-headless-ubuntu, lts-jdk-headless-ubuntu, 21.0.6-jdk-headless-ubuntu, 21-jdk-headless-ubuntu-noble, 21-jdk-headless-ubuntu-24.04, lts-jdk-headless-ubuntu-noble, lts-jdk-headless-ubuntu-24.04, 21.0.6-jdk-headless-ubuntu-noble, 21.0.6-jdk-headless-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/24_04/jdk-headless
 
-Tags: 21-jdk-headless-ubuntu-focal, 21-jdk-headless-ubuntu-20.04, lts-jdk-headless-ubuntu-focal, lts-jdk-headless-ubuntu-20.04, 21.0.5-jdk-headless-ubuntu-focal, 21.0.5-jdk-headless-ubuntu-20.04
+Tags: 21-jdk-headless-ubuntu-focal, 21-jdk-headless-ubuntu-20.04, lts-jdk-headless-ubuntu-focal, lts-jdk-headless-ubuntu-20.04, 21.0.6-jdk-headless-ubuntu-focal, 21.0.6-jdk-headless-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/20_04/jdk-headless
 
-Tags: 21-jdk-headless-ubuntu-jammy, 21-jdk-headless-ubuntu-22.04, lts-jdk-headless-ubuntu-jammy, lts-jdk-headless-ubuntu-22.04, 21.0.5-jdk-headless-ubuntu-jammy, 21.0.5-jdk-headless-ubuntu-22.04
+Tags: 21-jdk-headless-ubuntu-jammy, 21-jdk-headless-ubuntu-22.04, lts-jdk-headless-ubuntu-jammy, lts-jdk-headless-ubuntu-22.04, 21.0.6-jdk-headless-ubuntu-jammy, 21.0.6-jdk-headless-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/22_04/jdk-headless
 
-Tags: 21-jre-headless-ubuntu, lts-jre-headless-ubuntu, 21.0.5-jre-headless-ubuntu, 21-jre-headless-ubuntu-noble, 21-jre-headless-ubuntu-24.04, lts-jre-headless-ubuntu-noble, lts-jre-headless-ubuntu-24.04, 21.0.5-jre-headless-ubuntu-noble, 21.0.5-jre-headless-ubuntu-24.04
+Tags: 21-jre-alpine, lts-jre-alpine, 21.0.6-jre-alpine, 21-jre-alpine-3.21, lts-jre-alpine-3.21, 21.0.6-jre-alpine-3.21
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
+Directory: dockerfiles/21/alpine/3_21/jre
+
+Tags: 21-jre-headless-ubuntu, lts-jre-headless-ubuntu, 21.0.6-jre-headless-ubuntu, 21-jre-headless-ubuntu-noble, 21-jre-headless-ubuntu-24.04, lts-jre-headless-ubuntu-noble, lts-jre-headless-ubuntu-24.04, 21.0.6-jre-headless-ubuntu-noble, 21.0.6-jre-headless-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/24_04/jre-headless
 
-Tags: 21-jre-headless-ubuntu-focal, 21-jre-headless-ubuntu-20.04, lts-jre-headless-ubuntu-focal, lts-jre-headless-ubuntu-20.04, 21.0.5-jre-headless-ubuntu-focal, 21.0.5-jre-headless-ubuntu-20.04
+Tags: 21-jre-headless-ubuntu-focal, 21-jre-headless-ubuntu-20.04, lts-jre-headless-ubuntu-focal, lts-jre-headless-ubuntu-20.04, 21.0.6-jre-headless-ubuntu-focal, 21.0.6-jre-headless-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/20_04/jre-headless
 
-Tags: 21-jre-headless-ubuntu-jammy, 21-jre-headless-ubuntu-22.04, lts-jre-headless-ubuntu-jammy, lts-jre-headless-ubuntu-22.04, 21.0.5-jre-headless-ubuntu-jammy, 21.0.5-jre-headless-ubuntu-22.04
+Tags: 21-jre-headless-ubuntu-jammy, 21-jre-headless-ubuntu-22.04, lts-jre-headless-ubuntu-jammy, lts-jre-headless-ubuntu-22.04, 21.0.6-jre-headless-ubuntu-jammy, 21.0.6-jre-headless-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/22_04/jre-headless
 
-Tags: 21-jre-ubuntu, lts-jre-ubuntu, 21.0.5-jre-ubuntu, 21-jre-ubuntu-noble, 21-jre-ubuntu-24.04, lts-jre-ubuntu-noble, lts-jre-ubuntu-24.04, 21.0.5-jre-ubuntu-noble, 21.0.5-jre-ubuntu-24.04
+Tags: 21-jre-ubuntu, lts-jre-ubuntu, 21.0.6-jre-ubuntu, 21-jre-ubuntu-noble, 21-jre-ubuntu-24.04, lts-jre-ubuntu-noble, lts-jre-ubuntu-24.04, 21.0.6-jre-ubuntu-noble, 21.0.6-jre-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/24_04/jre
 
-Tags: 21-jre-ubuntu-focal, 21-jre-ubuntu-20.04, lts-jre-ubuntu-focal, lts-jre-ubuntu-20.04, 21.0.5-jre-ubuntu-focal, 21.0.5-jre-ubuntu-20.04
+Tags: 21-jre-ubuntu-focal, 21-jre-ubuntu-20.04, lts-jre-ubuntu-focal, lts-jre-ubuntu-20.04, 21.0.6-jre-ubuntu-focal, 21.0.6-jre-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/20_04/jre
 
-Tags: 21-jre-ubuntu-jammy, 21-jre-ubuntu-22.04, lts-jre-ubuntu-jammy, lts-jre-ubuntu-22.04, 21.0.5-jre-ubuntu-jammy, 21.0.5-jre-ubuntu-22.04
+Tags: 21-jre-ubuntu-jammy, 21-jre-ubuntu-22.04, lts-jre-ubuntu-jammy, lts-jre-ubuntu-22.04, 21.0.6-jre-ubuntu-jammy, 21.0.6-jre-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/22_04/jre
 
-Tags: 21-ubuntu-focal, 21-ubuntu-20.04, lts-ubuntu-focal, lts-ubuntu-20.04, 21.0.5-ubuntu-focal, 21.0.5-ubuntu-20.04, 21-jdk-ubuntu-focal, 21-jdk-ubuntu-20.04, lts-jdk-ubuntu-focal, lts-jdk-ubuntu-20.04, 21.0.5-jdk-ubuntu-focal, 21.0.5-jdk-ubuntu-20.04
+Tags: 21-ubuntu-focal, 21-ubuntu-20.04, lts-ubuntu-focal, lts-ubuntu-20.04, 21.0.6-ubuntu-focal, 21.0.6-ubuntu-20.04, 21-jdk-ubuntu-focal, 21-jdk-ubuntu-20.04, lts-jdk-ubuntu-focal, lts-jdk-ubuntu-20.04, 21.0.6-jdk-ubuntu-focal, 21.0.6-jdk-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/20_04/jdk
 
-Tags: 21-ubuntu-jammy, 21-ubuntu-22.04, lts-ubuntu-jammy, lts-ubuntu-22.04, 21.0.5-ubuntu-jammy, 21.0.5-ubuntu-22.04, 21-jdk-ubuntu-jammy, 21-jdk-ubuntu-22.04, lts-jdk-ubuntu-jammy, lts-jdk-ubuntu-22.04, 21.0.5-jdk-ubuntu-jammy, 21.0.5-jdk-ubuntu-22.04
+Tags: 21-ubuntu-jammy, 21-ubuntu-22.04, lts-ubuntu-jammy, lts-ubuntu-22.04, 21.0.6-ubuntu-jammy, 21.0.6-ubuntu-22.04, 21-jdk-ubuntu-jammy, 21-jdk-ubuntu-22.04, lts-jdk-ubuntu-jammy, lts-jdk-ubuntu-22.04, 21.0.6-jdk-ubuntu-jammy, 21.0.6-jdk-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f6332a68a6d854ff953f36794b0103497b644e11
+GitCommit: 5a0f490d8e2752109f0d84b5d89a605c09512a14
 Directory: dockerfiles/21/ubuntu/22_04/jdk
 
-Tags: 23-jdk-headless-ubuntu-focal, 23-jdk-headless-ubuntu-20.04, jdk-headless-ubuntu-focal, jdk-headless-ubuntu-20.04, 23.0.1-jdk-headless-ubuntu-focal, 23.0.1-jdk-headless-ubuntu-20.04
+Tags: 23-jdk-headless-ubuntu-focal, 23-jdk-headless-ubuntu-20.04, jdk-headless-ubuntu-focal, jdk-headless-ubuntu-20.04, 23.0.2-jdk-headless-ubuntu-focal, 23.0.2-jdk-headless-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/20_04/jdk-headless
 
-Tags: 23-jdk-headless-ubuntu-jammy, 23-jdk-headless-ubuntu-22.04, jdk-headless-ubuntu-jammy, jdk-headless-ubuntu-22.04, 23.0.1-jdk-headless-ubuntu-jammy, 23.0.1-jdk-headless-ubuntu-22.04
+Tags: 23-jdk-headless-ubuntu-jammy, 23-jdk-headless-ubuntu-22.04, jdk-headless-ubuntu-jammy, jdk-headless-ubuntu-22.04, 23.0.2-jdk-headless-ubuntu-jammy, 23.0.2-jdk-headless-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/22_04/jdk-headless
 
-Tags: 23-jre-headless-ubuntu-focal, 23-jre-headless-ubuntu-20.04, jre-headless-ubuntu-focal, jre-headless-ubuntu-20.04, 23.0.1-jre-headless-ubuntu-focal, 23.0.1-jre-headless-ubuntu-20.04
+Tags: 23-jre-headless-ubuntu-focal, 23-jre-headless-ubuntu-20.04, jre-headless-ubuntu-focal, jre-headless-ubuntu-20.04, 23.0.2-jre-headless-ubuntu-focal, 23.0.2-jre-headless-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/20_04/jre-headless
 
-Tags: 23-jre-headless-ubuntu-jammy, 23-jre-headless-ubuntu-22.04, jre-headless-ubuntu-jammy, jre-headless-ubuntu-22.04, 23.0.1-jre-headless-ubuntu-jammy, 23.0.1-jre-headless-ubuntu-22.04
+Tags: 23-jre-headless-ubuntu-jammy, 23-jre-headless-ubuntu-22.04, jre-headless-ubuntu-jammy, jre-headless-ubuntu-22.04, 23.0.2-jre-headless-ubuntu-jammy, 23.0.2-jre-headless-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/22_04/jre-headless
 
-Tags: 23-jre-ubuntu-focal, 23-jre-ubuntu-20.04, jre-ubuntu-focal, jre-ubuntu-20.04, 23.0.1-jre-ubuntu-focal, 23.0.1-jre-ubuntu-20.04
+Tags: 23-jre-ubuntu-focal, 23-jre-ubuntu-20.04, jre-ubuntu-focal, jre-ubuntu-20.04, 23.0.2-jre-ubuntu-focal, 23.0.2-jre-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/20_04/jre
 
-Tags: 23-jre-ubuntu-jammy, 23-jre-ubuntu-22.04, jre-ubuntu-jammy, jre-ubuntu-22.04, 23.0.1-jre-ubuntu-jammy, 23.0.1-jre-ubuntu-22.04
+Tags: 23-jre-ubuntu-jammy, 23-jre-ubuntu-22.04, jre-ubuntu-jammy, jre-ubuntu-22.04, 23.0.2-jre-ubuntu-jammy, 23.0.2-jre-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/22_04/jre
 
-Tags: jdk-headless-ubuntu, 23-jdk-headless-ubuntu, 23.0.1-jdk-headless-ubuntu, 23-jdk-headless-ubuntu-noble, 23-jdk-headless-ubuntu-24.04, jdk-headless-ubuntu-noble, jdk-headless-ubuntu-24.04, 23.0.1-jdk-headless-ubuntu-noble, 23.0.1-jdk-headless-ubuntu-24.04
+Tags: jdk-alpine, 23-jdk-alpine, 23.0.2-jdk-alpine, alpine-3.21, 23-alpine-3.21, 23.0.2-alpine-3.21, 23-jdk-alpine-3.21, jdk-alpine-3.21, 23.0.2-jdk-alpine-3.21
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
+Directory: dockerfiles/23/alpine/3_21/jdk
+
+Tags: jdk-headless-ubuntu, 23-jdk-headless-ubuntu, 23.0.2-jdk-headless-ubuntu, 23-jdk-headless-ubuntu-noble, 23-jdk-headless-ubuntu-24.04, jdk-headless-ubuntu-noble, jdk-headless-ubuntu-24.04, 23.0.2-jdk-headless-ubuntu-noble, 23.0.2-jdk-headless-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/24_04/jdk-headless
 
-Tags: jre-headless-ubuntu, 23-jre-headless-ubuntu, 23.0.1-jre-headless-ubuntu, 23-jre-headless-ubuntu-noble, 23-jre-headless-ubuntu-24.04, jre-headless-ubuntu-noble, jre-headless-ubuntu-24.04, 23.0.1-jre-headless-ubuntu-noble, 23.0.1-jre-headless-ubuntu-24.04
+Tags: jre-alpine, 23-jre-alpine, 23.0.2-jre-alpine, 23-jre-alpine-3.21, jre-alpine-3.21, 23.0.2-jre-alpine-3.21
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
+Directory: dockerfiles/23/alpine/3_21/jre
+
+Tags: jre-headless-ubuntu, 23-jre-headless-ubuntu, 23.0.2-jre-headless-ubuntu, 23-jre-headless-ubuntu-noble, 23-jre-headless-ubuntu-24.04, jre-headless-ubuntu-noble, jre-headless-ubuntu-24.04, 23.0.2-jre-headless-ubuntu-noble, 23.0.2-jre-headless-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/24_04/jre-headless
 
-Tags: jre-ubuntu, 23-jre-ubuntu, 23.0.1-jre-ubuntu, 23-jre-ubuntu-noble, 23-jre-ubuntu-24.04, jre-ubuntu-noble, jre-ubuntu-24.04, 23.0.1-jre-ubuntu-noble, 23.0.1-jre-ubuntu-24.04
+Tags: jre-ubuntu, 23-jre-ubuntu, 23.0.2-jre-ubuntu, 23-jre-ubuntu-noble, 23-jre-ubuntu-24.04, jre-ubuntu-noble, jre-ubuntu-24.04, 23.0.2-jre-ubuntu-noble, 23.0.2-jre-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/24_04/jre
 
-Tags: latest, jdk-ubuntu, 23, 23-jdk-ubuntu, 23.0.1, 23.0.1-jdk-ubuntu, ubuntu-noble, ubuntu-24.04, 23-ubuntu-noble, 23-ubuntu-24.04, 23.0.1-ubuntu-noble, 23.0.1-ubuntu-24.04, 23-jdk-ubuntu-noble, 23-jdk-ubuntu-24.04, jdk-ubuntu-noble, jdk-ubuntu-24.04, 23.0.1-jdk-ubuntu-noble, 23.0.1-jdk-ubuntu-24.04
+Tags: latest, jdk-ubuntu, 23, 23-jdk-ubuntu, 23.0.2, 23.0.2-jdk-ubuntu, ubuntu-noble, ubuntu-24.04, 23-ubuntu-noble, 23-ubuntu-24.04, 23.0.2-ubuntu-noble, 23.0.2-ubuntu-24.04, 23-jdk-ubuntu-noble, 23-jdk-ubuntu-24.04, jdk-ubuntu-noble, jdk-ubuntu-24.04, 23.0.2-jdk-ubuntu-noble, 23.0.2-jdk-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/24_04/jdk
 
-Tags: ubuntu-focal, ubuntu-20.04, 23-ubuntu-focal, 23-ubuntu-20.04, 23.0.1-ubuntu-focal, 23.0.1-ubuntu-20.04, 23-jdk-ubuntu-focal, 23-jdk-ubuntu-20.04, jdk-ubuntu-focal, jdk-ubuntu-20.04, 23.0.1-jdk-ubuntu-focal, 23.0.1-jdk-ubuntu-20.04
+Tags: ubuntu-focal, ubuntu-20.04, 23-ubuntu-focal, 23-ubuntu-20.04, 23.0.2-ubuntu-focal, 23.0.2-ubuntu-20.04, 23-jdk-ubuntu-focal, 23-jdk-ubuntu-20.04, jdk-ubuntu-focal, jdk-ubuntu-20.04, 23.0.2-jdk-ubuntu-focal, 23.0.2-jdk-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/20_04/jdk
 
-Tags: ubuntu-jammy, ubuntu-22.04, 23-ubuntu-jammy, 23-ubuntu-22.04, 23.0.1-ubuntu-jammy, 23.0.1-ubuntu-22.04, 23-jdk-ubuntu-jammy, 23-jdk-ubuntu-22.04, jdk-ubuntu-jammy, jdk-ubuntu-22.04, 23.0.1-jdk-ubuntu-jammy, 23.0.1-jdk-ubuntu-22.04
+Tags: ubuntu-jammy, ubuntu-22.04, 23-ubuntu-jammy, 23-ubuntu-22.04, 23.0.2-ubuntu-jammy, 23.0.2-ubuntu-22.04, 23-jdk-ubuntu-jammy, 23-jdk-ubuntu-22.04, jdk-ubuntu-jammy, jdk-ubuntu-22.04, 23.0.2-jdk-ubuntu-jammy, 23.0.2-jdk-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: fb314957163ab9a7061648b0de748eab60bdb29e
+GitCommit: c522b3cc1152e5b666dc5b5731f98afd91b22804
 Directory: dockerfiles/23/ubuntu/22_04/jdk
diff --git a/_bashbrew-list b/_bashbrew-list
index bd34e8b..76a91b5 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -33,42 +33,45 @@ sapmachine:11-ubuntu-24.04
 sapmachine:11-ubuntu-focal
 sapmachine:11-ubuntu-jammy
 sapmachine:11-ubuntu-noble
-sapmachine:11.0.25
-sapmachine:11.0.25-jdk-headless-ubuntu
-sapmachine:11.0.25-jdk-headless-ubuntu-20.04
-sapmachine:11.0.25-jdk-headless-ubuntu-22.04
-sapmachine:11.0.25-jdk-headless-ubuntu-24.04
-sapmachine:11.0.25-jdk-headless-ubuntu-focal
-sapmachine:11.0.25-jdk-headless-ubuntu-jammy
-sapmachine:11.0.25-jdk-headless-ubuntu-noble
-sapmachine:11.0.25-jdk-ubuntu
-sapmachine:11.0.25-jdk-ubuntu-20.04
-sapmachine:11.0.25-jdk-ubuntu-22.04
-sapmachine:11.0.25-jdk-ubuntu-24.04
-sapmachine:11.0.25-jdk-ubuntu-focal
-sapmachine:11.0.25-jdk-ubuntu-jammy
-sapmachine:11.0.25-jdk-ubuntu-noble
-sapmachine:11.0.25-jre-headless-ubuntu
-sapmachine:11.0.25-jre-headless-ubuntu-20.04
-sapmachine:11.0.25-jre-headless-ubuntu-22.04
-sapmachine:11.0.25-jre-headless-ubuntu-24.04
-sapmachine:11.0.25-jre-headless-ubuntu-focal
-sapmachine:11.0.25-jre-headless-ubuntu-jammy
-sapmachine:11.0.25-jre-headless-ubuntu-noble
-sapmachine:11.0.25-jre-ubuntu
-sapmachine:11.0.25-jre-ubuntu-20.04
-sapmachine:11.0.25-jre-ubuntu-22.04
-sapmachine:11.0.25-jre-ubuntu-24.04
-sapmachine:11.0.25-jre-ubuntu-focal
-sapmachine:11.0.25-jre-ubuntu-jammy
-sapmachine:11.0.25-jre-ubuntu-noble
-sapmachine:11.0.25-ubuntu-20.04
-sapmachine:11.0.25-ubuntu-22.04
-sapmachine:11.0.25-ubuntu-24.04
-sapmachine:11.0.25-ubuntu-focal
-sapmachine:11.0.25-ubuntu-jammy
-sapmachine:11.0.25-ubuntu-noble
+sapmachine:11.0.26
+sapmachine:11.0.26-jdk-headless-ubuntu
+sapmachine:11.0.26-jdk-headless-ubuntu-20.04
+sapmachine:11.0.26-jdk-headless-ubuntu-22.04
+sapmachine:11.0.26-jdk-headless-ubuntu-24.04
+sapmachine:11.0.26-jdk-headless-ubuntu-focal
+sapmachine:11.0.26-jdk-headless-ubuntu-jammy
+sapmachine:11.0.26-jdk-headless-ubuntu-noble
+sapmachine:11.0.26-jdk-ubuntu
+sapmachine:11.0.26-jdk-ubuntu-20.04
+sapmachine:11.0.26-jdk-ubuntu-22.04
+sapmachine:11.0.26-jdk-ubuntu-24.04
+sapmachine:11.0.26-jdk-ubuntu-focal
+sapmachine:11.0.26-jdk-ubuntu-jammy
+sapmachine:11.0.26-jdk-ubuntu-noble
+sapmachine:11.0.26-jre-headless-ubuntu
+sapmachine:11.0.26-jre-headless-ubuntu-20.04
+sapmachine:11.0.26-jre-headless-ubuntu-22.04
+sapmachine:11.0.26-jre-headless-ubuntu-24.04
+sapmachine:11.0.26-jre-headless-ubuntu-focal
+sapmachine:11.0.26-jre-headless-ubuntu-jammy
+sapmachine:11.0.26-jre-headless-ubuntu-noble
+sapmachine:11.0.26-jre-ubuntu
+sapmachine:11.0.26-jre-ubuntu-20.04
+sapmachine:11.0.26-jre-ubuntu-22.04
+sapmachine:11.0.26-jre-ubuntu-24.04
+sapmachine:11.0.26-jre-ubuntu-focal
+sapmachine:11.0.26-jre-ubuntu-jammy
+sapmachine:11.0.26-jre-ubuntu-noble
+sapmachine:11.0.26-ubuntu-20.04
+sapmachine:11.0.26-ubuntu-22.04
+sapmachine:11.0.26-ubuntu-24.04
+sapmachine:11.0.26-ubuntu-focal
+sapmachine:11.0.26-ubuntu-jammy
+sapmachine:11.0.26-ubuntu-noble
 sapmachine:17
+sapmachine:17-alpine-3.21
+sapmachine:17-jdk-alpine
+sapmachine:17-jdk-alpine-3.21
 sapmachine:17-jdk-headless-ubuntu
 sapmachine:17-jdk-headless-ubuntu-20.04
 sapmachine:17-jdk-headless-ubuntu-22.04
@@ -83,6 +86,8 @@ sapmachine:17-jdk-ubuntu-24.04
 sapmachine:17-jdk-ubuntu-focal
 sapmachine:17-jdk-ubuntu-jammy
 sapmachine:17-jdk-ubuntu-noble
+sapmachine:17-jre-alpine
+sapmachine:17-jre-alpine-3.21
 sapmachine:17-jre-headless-ubuntu
 sapmachine:17-jre-headless-ubuntu-20.04
 sapmachine:17-jre-headless-ubuntu-22.04
@@ -103,42 +108,50 @@ sapmachine:17-ubuntu-24.04
 sapmachine:17-ubuntu-focal
 sapmachine:17-ubuntu-jammy
 sapmachine:17-ubuntu-noble
-sapmachine:17.0.13
-sapmachine:17.0.13-jdk-headless-ubuntu
-sapmachine:17.0.13-jdk-headless-ubuntu-20.04
-sapmachine:17.0.13-jdk-headless-ubuntu-22.04
-sapmachine:17.0.13-jdk-headless-ubuntu-24.04
-sapmachine:17.0.13-jdk-headless-ubuntu-focal
-sapmachine:17.0.13-jdk-headless-ubuntu-jammy
-sapmachine:17.0.13-jdk-headless-ubuntu-noble
-sapmachine:17.0.13-jdk-ubuntu
-sapmachine:17.0.13-jdk-ubuntu-20.04
-sapmachine:17.0.13-jdk-ubuntu-22.04
-sapmachine:17.0.13-jdk-ubuntu-24.04
-sapmachine:17.0.13-jdk-ubuntu-focal
-sapmachine:17.0.13-jdk-ubuntu-jammy
-sapmachine:17.0.13-jdk-ubuntu-noble
-sapmachine:17.0.13-jre-headless-ubuntu
-sapmachine:17.0.13-jre-headless-ubuntu-20.04
-sapmachine:17.0.13-jre-headless-ubuntu-22.04
-sapmachine:17.0.13-jre-headless-ubuntu-24.04
-sapmachine:17.0.13-jre-headless-ubuntu-focal
-sapmachine:17.0.13-jre-headless-ubuntu-jammy
-sapmachine:17.0.13-jre-headless-ubuntu-noble
-sapmachine:17.0.13-jre-ubuntu
-sapmachine:17.0.13-jre-ubuntu-20.04
-sapmachine:17.0.13-jre-ubuntu-22.04
-sapmachine:17.0.13-jre-ubuntu-24.04
-sapmachine:17.0.13-jre-ubuntu-focal
-sapmachine:17.0.13-jre-ubuntu-jammy
-sapmachine:17.0.13-jre-ubuntu-noble
-sapmachine:17.0.13-ubuntu-20.04
-sapmachine:17.0.13-ubuntu-22.04
-sapmachine:17.0.13-ubuntu-24.04
-sapmachine:17.0.13-ubuntu-focal
-sapmachine:17.0.13-ubuntu-jammy
-sapmachine:17.0.13-ubuntu-noble
+sapmachine:17.0.14
+sapmachine:17.0.14-alpine-3.21
+sapmachine:17.0.14-jdk-alpine
+sapmachine:17.0.14-jdk-alpine-3.21
+sapmachine:17.0.14-jdk-headless-ubuntu
+sapmachine:17.0.14-jdk-headless-ubuntu-20.04
+sapmachine:17.0.14-jdk-headless-ubuntu-22.04
+sapmachine:17.0.14-jdk-headless-ubuntu-24.04
+sapmachine:17.0.14-jdk-headless-ubuntu-focal
+sapmachine:17.0.14-jdk-headless-ubuntu-jammy
+sapmachine:17.0.14-jdk-headless-ubuntu-noble
+sapmachine:17.0.14-jdk-ubuntu
+sapmachine:17.0.14-jdk-ubuntu-20.04
+sapmachine:17.0.14-jdk-ubuntu-22.04
+sapmachine:17.0.14-jdk-ubuntu-24.04
+sapmachine:17.0.14-jdk-ubuntu-focal
+sapmachine:17.0.14-jdk-ubuntu-jammy
+sapmachine:17.0.14-jdk-ubuntu-noble
+sapmachine:17.0.14-jre-alpine
+sapmachine:17.0.14-jre-alpine-3.21
+sapmachine:17.0.14-jre-headless-ubuntu
+sapmachine:17.0.14-jre-headless-ubuntu-20.04
+sapmachine:17.0.14-jre-headless-ubuntu-22.04
+sapmachine:17.0.14-jre-headless-ubuntu-24.04
+sapmachine:17.0.14-jre-headless-ubuntu-focal
+sapmachine:17.0.14-jre-headless-ubuntu-jammy
+sapmachine:17.0.14-jre-headless-ubuntu-noble
+sapmachine:17.0.14-jre-ubuntu
+sapmachine:17.0.14-jre-ubuntu-20.04
+sapmachine:17.0.14-jre-ubuntu-22.04
+sapmachine:17.0.14-jre-ubuntu-24.04
+sapmachine:17.0.14-jre-ubuntu-focal
+sapmachine:17.0.14-jre-ubuntu-jammy
+sapmachine:17.0.14-jre-ubuntu-noble
+sapmachine:17.0.14-ubuntu-20.04
+sapmachine:17.0.14-ubuntu-22.04
+sapmachine:17.0.14-ubuntu-24.04
+sapmachine:17.0.14-ubuntu-focal
+sapmachine:17.0.14-ubuntu-jammy
+sapmachine:17.0.14-ubuntu-noble
 sapmachine:21
+sapmachine:21-alpine-3.21
+sapmachine:21-jdk-alpine
+sapmachine:21-jdk-alpine-3.21
 sapmachine:21-jdk-headless-ubuntu
 sapmachine:21-jdk-headless-ubuntu-20.04
 sapmachine:21-jdk-headless-ubuntu-22.04
@@ -153,6 +166,8 @@ sapmachine:21-jdk-ubuntu-24.04
 sapmachine:21-jdk-ubuntu-focal
 sapmachine:21-jdk-ubuntu-jammy
 sapmachine:21-jdk-ubuntu-noble
+sapmachine:21-jre-alpine
+sapmachine:21-jre-alpine-3.21
 sapmachine:21-jre-headless-ubuntu
 sapmachine:21-jre-headless-ubuntu-20.04
 sapmachine:21-jre-headless-ubuntu-22.04
@@ -173,42 +188,50 @@ sapmachine:21-ubuntu-24.04
 sapmachine:21-ubuntu-focal
 sapmachine:21-ubuntu-jammy
 sapmachine:21-ubuntu-noble
-sapmachine:21.0.5
-sapmachine:21.0.5-jdk-headless-ubuntu
-sapmachine:21.0.5-jdk-headless-ubuntu-20.04
-sapmachine:21.0.5-jdk-headless-ubuntu-22.04
-sapmachine:21.0.5-jdk-headless-ubuntu-24.04
-sapmachine:21.0.5-jdk-headless-ubuntu-focal
-sapmachine:21.0.5-jdk-headless-ubuntu-jammy
-sapmachine:21.0.5-jdk-headless-ubuntu-noble
-sapmachine:21.0.5-jdk-ubuntu
-sapmachine:21.0.5-jdk-ubuntu-20.04
-sapmachine:21.0.5-jdk-ubuntu-22.04
-sapmachine:21.0.5-jdk-ubuntu-24.04
-sapmachine:21.0.5-jdk-ubuntu-focal
-sapmachine:21.0.5-jdk-ubuntu-jammy
-sapmachine:21.0.5-jdk-ubuntu-noble
-sapmachine:21.0.5-jre-headless-ubuntu
-sapmachine:21.0.5-jre-headless-ubuntu-20.04
-sapmachine:21.0.5-jre-headless-ubuntu-22.04
-sapmachine:21.0.5-jre-headless-ubuntu-24.04
-sapmachine:21.0.5-jre-headless-ubuntu-focal
-sapmachine:21.0.5-jre-headless-ubuntu-jammy
-sapmachine:21.0.5-jre-headless-ubuntu-noble
-sapmachine:21.0.5-jre-ubuntu
-sapmachine:21.0.5-jre-ubuntu-20.04
-sapmachine:21.0.5-jre-ubuntu-22.04
-sapmachine:21.0.5-jre-ubuntu-24.04
-sapmachine:21.0.5-jre-ubuntu-focal
-sapmachine:21.0.5-jre-ubuntu-jammy
-sapmachine:21.0.5-jre-ubuntu-noble
-sapmachine:21.0.5-ubuntu-20.04
-sapmachine:21.0.5-ubuntu-22.04
-sapmachine:21.0.5-ubuntu-24.04
-sapmachine:21.0.5-ubuntu-focal
-sapmachine:21.0.5-ubuntu-jammy
-sapmachine:21.0.5-ubuntu-noble
+sapmachine:21.0.6
+sapmachine:21.0.6-alpine-3.21
+sapmachine:21.0.6-jdk-alpine
+sapmachine:21.0.6-jdk-alpine-3.21
+sapmachine:21.0.6-jdk-headless-ubuntu
+sapmachine:21.0.6-jdk-headless-ubuntu-20.04
+sapmachine:21.0.6-jdk-headless-ubuntu-22.04
+sapmachine:21.0.6-jdk-headless-ubuntu-24.04
+sapmachine:21.0.6-jdk-headless-ubuntu-focal
+sapmachine:21.0.6-jdk-headless-ubuntu-jammy
+sapmachine:21.0.6-jdk-headless-ubuntu-noble
+sapmachine:21.0.6-jdk-ubuntu
+sapmachine:21.0.6-jdk-ubuntu-20.04
+sapmachine:21.0.6-jdk-ubuntu-22.04
+sapmachine:21.0.6-jdk-ubuntu-24.04
+sapmachine:21.0.6-jdk-ubuntu-focal
+sapmachine:21.0.6-jdk-ubuntu-jammy
+sapmachine:21.0.6-jdk-ubuntu-noble
+sapmachine:21.0.6-jre-alpine
+sapmachine:21.0.6-jre-alpine-3.21
+sapmachine:21.0.6-jre-headless-ubuntu
+sapmachine:21.0.6-jre-headless-ubuntu-20.04
+sapmachine:21.0.6-jre-headless-ubuntu-22.04
+sapmachine:21.0.6-jre-headless-ubuntu-24.04
+sapmachine:21.0.6-jre-headless-ubuntu-focal
+sapmachine:21.0.6-jre-headless-ubuntu-jammy
+sapmachine:21.0.6-jre-headless-ubuntu-noble
+sapmachine:21.0.6-jre-ubuntu
+sapmachine:21.0.6-jre-ubuntu-20.04
+sapmachine:21.0.6-jre-ubuntu-22.04
+sapmachine:21.0.6-jre-ubuntu-24.04
+sapmachine:21.0.6-jre-ubuntu-focal
+sapmachine:21.0.6-jre-ubuntu-jammy
+sapmachine:21.0.6-jre-ubuntu-noble
+sapmachine:21.0.6-ubuntu-20.04
+sapmachine:21.0.6-ubuntu-22.04
+sapmachine:21.0.6-ubuntu-24.04
+sapmachine:21.0.6-ubuntu-focal
+sapmachine:21.0.6-ubuntu-jammy
+sapmachine:21.0.6-ubuntu-noble
 sapmachine:23
+sapmachine:23-alpine-3.21
+sapmachine:23-jdk-alpine
+sapmachine:23-jdk-alpine-3.21
 sapmachine:23-jdk-headless-ubuntu
 sapmachine:23-jdk-headless-ubuntu-20.04
 sapmachine:23-jdk-headless-ubuntu-22.04
@@ -223,6 +246,8 @@ sapmachine:23-jdk-ubuntu-24.04
 sapmachine:23-jdk-ubuntu-focal
 sapmachine:23-jdk-ubuntu-jammy
 sapmachine:23-jdk-ubuntu-noble
+sapmachine:23-jre-alpine
+sapmachine:23-jre-alpine-3.21
 sapmachine:23-jre-headless-ubuntu
 sapmachine:23-jre-headless-ubuntu-20.04
 sapmachine:23-jre-headless-ubuntu-22.04
@@ -243,41 +268,49 @@ sapmachine:23-ubuntu-24.04
 sapmachine:23-ubuntu-focal
 sapmachine:23-ubuntu-jammy
 sapmachine:23-ubuntu-noble
-sapmachine:23.0.1
-sapmachine:23.0.1-jdk-headless-ubuntu
-sapmachine:23.0.1-jdk-headless-ubuntu-20.04
-sapmachine:23.0.1-jdk-headless-ubuntu-22.04
-sapmachine:23.0.1-jdk-headless-ubuntu-24.04
-sapmachine:23.0.1-jdk-headless-ubuntu-focal
-sapmachine:23.0.1-jdk-headless-ubuntu-jammy
-sapmachine:23.0.1-jdk-headless-ubuntu-noble
-sapmachine:23.0.1-jdk-ubuntu
-sapmachine:23.0.1-jdk-ubuntu-20.04
-sapmachine:23.0.1-jdk-ubuntu-22.04
-sapmachine:23.0.1-jdk-ubuntu-24.04
-sapmachine:23.0.1-jdk-ubuntu-focal
-sapmachine:23.0.1-jdk-ubuntu-jammy
-sapmachine:23.0.1-jdk-ubuntu-noble
-sapmachine:23.0.1-jre-headless-ubuntu
-sapmachine:23.0.1-jre-headless-ubuntu-20.04
-sapmachine:23.0.1-jre-headless-ubuntu-22.04
-sapmachine:23.0.1-jre-headless-ubuntu-24.04
-sapmachine:23.0.1-jre-headless-ubuntu-focal
-sapmachine:23.0.1-jre-headless-ubuntu-jammy
-sapmachine:23.0.1-jre-headless-ubuntu-noble
-sapmachine:23.0.1-jre-ubuntu
-sapmachine:23.0.1-jre-ubuntu-20.04
-sapmachine:23.0.1-jre-ubuntu-22.04
-sapmachine:23.0.1-jre-ubuntu-24.04
-sapmachine:23.0.1-jre-ubuntu-focal
-sapmachine:23.0.1-jre-ubuntu-jammy
-sapmachine:23.0.1-jre-ubuntu-noble
-sapmachine:23.0.1-ubuntu-20.04
-sapmachine:23.0.1-ubuntu-22.04
-sapmachine:23.0.1-ubuntu-24.04
-sapmachine:23.0.1-ubuntu-focal
-sapmachine:23.0.1-ubuntu-jammy
-sapmachine:23.0.1-ubuntu-noble
+sapmachine:23.0.2
+sapmachine:23.0.2-alpine-3.21
+sapmachine:23.0.2-jdk-alpine
+sapmachine:23.0.2-jdk-alpine-3.21
+sapmachine:23.0.2-jdk-headless-ubuntu
+sapmachine:23.0.2-jdk-headless-ubuntu-20.04
+sapmachine:23.0.2-jdk-headless-ubuntu-22.04
+sapmachine:23.0.2-jdk-headless-ubuntu-24.04
+sapmachine:23.0.2-jdk-headless-ubuntu-focal
+sapmachine:23.0.2-jdk-headless-ubuntu-jammy
+sapmachine:23.0.2-jdk-headless-ubuntu-noble
+sapmachine:23.0.2-jdk-ubuntu
+sapmachine:23.0.2-jdk-ubuntu-20.04
+sapmachine:23.0.2-jdk-ubuntu-22.04
+sapmachine:23.0.2-jdk-ubuntu-24.04
+sapmachine:23.0.2-jdk-ubuntu-focal
+sapmachine:23.0.2-jdk-ubuntu-jammy
+sapmachine:23.0.2-jdk-ubuntu-noble
+sapmachine:23.0.2-jre-alpine
+sapmachine:23.0.2-jre-alpine-3.21
+sapmachine:23.0.2-jre-headless-ubuntu
+sapmachine:23.0.2-jre-headless-ubuntu-20.04
+sapmachine:23.0.2-jre-headless-ubuntu-22.04
+sapmachine:23.0.2-jre-headless-ubuntu-24.04
+sapmachine:23.0.2-jre-headless-ubuntu-focal
+sapmachine:23.0.2-jre-headless-ubuntu-jammy
+sapmachine:23.0.2-jre-headless-ubuntu-noble
+sapmachine:23.0.2-jre-ubuntu
+sapmachine:23.0.2-jre-ubuntu-20.04
+sapmachine:23.0.2-jre-ubuntu-22.04
+sapmachine:23.0.2-jre-ubuntu-24.04
+sapmachine:23.0.2-jre-ubuntu-focal
+sapmachine:23.0.2-jre-ubuntu-jammy
+sapmachine:23.0.2-jre-ubuntu-noble
+sapmachine:23.0.2-ubuntu-20.04
+sapmachine:23.0.2-ubuntu-22.04
+sapmachine:23.0.2-ubuntu-24.04
+sapmachine:23.0.2-ubuntu-focal
+sapmachine:23.0.2-ubuntu-jammy
+sapmachine:23.0.2-ubuntu-noble
+sapmachine:alpine-3.21
+sapmachine:jdk-alpine
+sapmachine:jdk-alpine-3.21
 sapmachine:jdk-headless-ubuntu
 sapmachine:jdk-headless-ubuntu-20.04
 sapmachine:jdk-headless-ubuntu-22.04
@@ -292,6 +325,8 @@ sapmachine:jdk-ubuntu-24.04
 sapmachine:jdk-ubuntu-focal
 sapmachine:jdk-ubuntu-jammy
 sapmachine:jdk-ubuntu-noble
+sapmachine:jre-alpine
+sapmachine:jre-alpine-3.21
 sapmachine:jre-headless-ubuntu
 sapmachine:jre-headless-ubuntu-20.04
 sapmachine:jre-headless-ubuntu-22.04
@@ -308,6 +343,9 @@ sapmachine:jre-ubuntu-jammy
 sapmachine:jre-ubuntu-noble
 sapmachine:latest
 sapmachine:lts
+sapmachine:lts-alpine-3.21
+sapmachine:lts-jdk-alpine
+sapmachine:lts-jdk-alpine-3.21
 sapmachine:lts-jdk-headless-ubuntu
 sapmachine:lts-jdk-headless-ubuntu-20.04
 sapmachine:lts-jdk-headless-ubuntu-22.04
@@ -322,6 +360,8 @@ sapmachine:lts-jdk-ubuntu-24.04
 sapmachine:lts-jdk-ubuntu-focal
 sapmachine:lts-jdk-ubuntu-jammy
 sapmachine:lts-jdk-ubuntu-noble
+sapmachine:lts-jre-alpine
+sapmachine:lts-jre-alpine-3.21
 sapmachine:lts-jre-headless-ubuntu
 sapmachine:lts-jre-headless-ubuntu-20.04
 sapmachine:lts-jre-headless-ubuntu-22.04
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index dc4a6d5..6d9ab61 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,48 +1,54 @@
-sapmachine:11.0.25-jdk-headless-ubuntu-20.04
-sapmachine:11.0.25-jdk-headless-ubuntu-22.04
-sapmachine:11.0.25-jdk-headless-ubuntu-24.04
-sapmachine:11.0.25-jdk-ubuntu-20.04
-sapmachine:11.0.25-jdk-ubuntu-22.04
-sapmachine:11.0.25-jdk-ubuntu-24.04
-sapmachine:11.0.25-jre-headless-ubuntu-20.04
-sapmachine:11.0.25-jre-headless-ubuntu-22.04
-sapmachine:11.0.25-jre-headless-ubuntu-24.04
-sapmachine:11.0.25-jre-ubuntu-20.04
-sapmachine:11.0.25-jre-ubuntu-22.04
-sapmachine:11.0.25-jre-ubuntu-24.04
-sapmachine:17.0.13-jdk-headless-ubuntu-20.04
-sapmachine:17.0.13-jdk-headless-ubuntu-22.04
-sapmachine:17.0.13-jdk-headless-ubuntu-24.04
-sapmachine:17.0.13-jdk-ubuntu-20.04
-sapmachine:17.0.13-jdk-ubuntu-22.04
-sapmachine:17.0.13-jdk-ubuntu-24.04
-sapmachine:17.0.13-jre-headless-ubuntu-20.04
-sapmachine:17.0.13-jre-headless-ubuntu-22.04
-sapmachine:17.0.13-jre-headless-ubuntu-24.04
-sapmachine:17.0.13-jre-ubuntu-20.04
-sapmachine:17.0.13-jre-ubuntu-22.04
-sapmachine:17.0.13-jre-ubuntu-24.04
-sapmachine:21.0.5-jdk-headless-ubuntu-20.04
-sapmachine:21.0.5-jdk-headless-ubuntu-22.04
-sapmachine:21.0.5-jdk-headless-ubuntu-24.04
-sapmachine:21.0.5-jdk-ubuntu-20.04
-sapmachine:21.0.5-jdk-ubuntu-22.04
-sapmachine:21.0.5-jdk-ubuntu-24.04
-sapmachine:21.0.5-jre-headless-ubuntu-20.04
-sapmachine:21.0.5-jre-headless-ubuntu-22.04
-sapmachine:21.0.5-jre-headless-ubuntu-24.04
-sapmachine:21.0.5-jre-ubuntu-20.04
-sapmachine:21.0.5-jre-ubuntu-22.04
-sapmachine:21.0.5-jre-ubuntu-24.04
-sapmachine:23.0.1-jdk-headless-ubuntu-20.04
-sapmachine:23.0.1-jdk-headless-ubuntu-22.04
-sapmachine:23.0.1-jdk-headless-ubuntu-24.04
-sapmachine:23.0.1-jdk-ubuntu-20.04
-sapmachine:23.0.1-jdk-ubuntu-22.04
-sapmachine:23.0.1-jdk-ubuntu-24.04
-sapmachine:23.0.1-jre-headless-ubuntu-20.04
-sapmachine:23.0.1-jre-headless-ubuntu-22.04
-sapmachine:23.0.1-jre-headless-ubuntu-24.04
-sapmachine:23.0.1-jre-ubuntu-20.04
-sapmachine:23.0.1-jre-ubuntu-22.04
-sapmachine:23.0.1-jre-ubuntu-24.04
+sapmachine:11.0.26-jdk-headless-ubuntu-20.04
+sapmachine:11.0.26-jdk-headless-ubuntu-22.04
+sapmachine:11.0.26-jdk-headless-ubuntu-24.04
+sapmachine:11.0.26-jdk-ubuntu-20.04
+sapmachine:11.0.26-jdk-ubuntu-22.04
+sapmachine:11.0.26-jdk-ubuntu-24.04
+sapmachine:11.0.26-jre-headless-ubuntu-20.04
+sapmachine:11.0.26-jre-headless-ubuntu-22.04
+sapmachine:11.0.26-jre-headless-ubuntu-24.04
+sapmachine:11.0.26-jre-ubuntu-20.04
+sapmachine:11.0.26-jre-ubuntu-22.04
+sapmachine:11.0.26-jre-ubuntu-24.04
+sapmachine:17.0.14-jdk-alpine-3.21
+sapmachine:17.0.14-jdk-headless-ubuntu-20.04
+sapmachine:17.0.14-jdk-headless-ubuntu-22.04
+sapmachine:17.0.14-jdk-headless-ubuntu-24.04
+sapmachine:17.0.14-jdk-ubuntu-20.04
+sapmachine:17.0.14-jdk-ubuntu-22.04
+sapmachine:17.0.14-jdk-ubuntu-24.04
+sapmachine:17.0.14-jre-alpine-3.21
+sapmachine:17.0.14-jre-headless-ubuntu-20.04
+sapmachine:17.0.14-jre-headless-ubuntu-22.04
+sapmachine:17.0.14-jre-headless-ubuntu-24.04
+sapmachine:17.0.14-jre-ubuntu-20.04
+sapmachine:17.0.14-jre-ubuntu-22.04
+sapmachine:17.0.14-jre-ubuntu-24.04
+sapmachine:21.0.6-jdk-alpine-3.21
+sapmachine:21.0.6-jdk-headless-ubuntu-20.04
+sapmachine:21.0.6-jdk-headless-ubuntu-22.04
+sapmachine:21.0.6-jdk-headless-ubuntu-24.04
+sapmachine:21.0.6-jdk-ubuntu-20.04
+sapmachine:21.0.6-jdk-ubuntu-22.04
+sapmachine:21.0.6-jdk-ubuntu-24.04
+sapmachine:21.0.6-jre-alpine-3.21
+sapmachine:21.0.6-jre-headless-ubuntu-20.04
+sapmachine:21.0.6-jre-headless-ubuntu-22.04
+sapmachine:21.0.6-jre-headless-ubuntu-24.04
+sapmachine:21.0.6-jre-ubuntu-20.04
+sapmachine:21.0.6-jre-ubuntu-22.04
+sapmachine:21.0.6-jre-ubuntu-24.04
+sapmachine:23.0.2-jdk-alpine-3.21
+sapmachine:23.0.2-jdk-headless-ubuntu-20.04
+sapmachine:23.0.2-jdk-headless-ubuntu-22.04
+sapmachine:23.0.2-jdk-headless-ubuntu-24.04
+sapmachine:23.0.2-jdk-ubuntu-20.04
+sapmachine:23.0.2-jdk-ubuntu-22.04
+sapmachine:23.0.2-jdk-ubuntu-24.04
+sapmachine:23.0.2-jre-alpine-3.21
+sapmachine:23.0.2-jre-headless-ubuntu-20.04
+sapmachine:23.0.2-jre-headless-ubuntu-22.04
+sapmachine:23.0.2-jre-headless-ubuntu-24.04
+sapmachine:23.0.2-jre-ubuntu-20.04
+sapmachine:23.0.2-jre-ubuntu-22.04
+sapmachine:23.0.2-jre-ubuntu-24.04
diff --git a/sapmachine_11.0.25-jdk-headless-ubuntu-20.04/Dockerfile b/sapmachine_11.0.25-jdk-headless-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 8fdf134..0000000
diff --git a/sapmachine_11.0.25-jdk-headless-ubuntu-22.04/Dockerfile b/sapmachine_11.0.25-jdk-headless-ubuntu-22.04/Dockerfile
deleted file mode 100644
index 3f1c2fb..0000000
diff --git a/sapmachine_11.0.25-jdk-headless-ubuntu-24.04/Dockerfile b/sapmachine_11.0.25-jdk-headless-ubuntu-24.04/Dockerfile
deleted file mode 100644
index 8caef2d..0000000
diff --git a/sapmachine_11.0.25-jdk-ubuntu-20.04/Dockerfile b/sapmachine_11.0.25-jdk-ubuntu-20.04/Dockerfile
deleted file mode 100644
index b1cfa0e..0000000
diff --git a/sapmachine_11.0.25-jdk-ubuntu-22.04/Dockerfile b/sapmachine_11.0.25-jdk-ubuntu-22.04/Dockerfile
deleted file mode 100644
index 67eb2e5..0000000
diff --git a/sapmachine_11.0.25-jdk-ubuntu-24.04/Dockerfile b/sapmachine_11.0.25-jdk-ubuntu-24.04/Dockerfile
deleted file mode 100644
index d533bc7..0000000
diff --git a/sapmachine_11.0.25-jre-headless-ubuntu-20.04/Dockerfile b/sapmachine_11.0.25-jre-headless-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 53d0347..0000000
diff --git a/sapmachine_11.0.25-jre-headless-ubuntu-22.04/Dockerfile b/sapmachine_11.0.25-jre-headless-ubuntu-22.04/Dockerfile
deleted file mode 100644
index cb9059f..0000000
diff --git a/sapmachine_11.0.25-jre-headless-ubuntu-24.04/Dockerfile b/sapmachine_11.0.25-jre-headless-ubuntu-24.04/Dockerfile
deleted file mode 100644
index 03cee4e..0000000
diff --git a/sapmachine_11.0.25-jre-ubuntu-20.04/Dockerfile b/sapmachine_11.0.25-jre-ubuntu-20.04/Dockerfile
deleted file mode 100644
index d3e9ef0..0000000
diff --git a/sapmachine_11.0.25-jre-ubuntu-22.04/Dockerfile b/sapmachine_11.0.25-jre-ubuntu-22.04/Dockerfile
deleted file mode 100644
index fdef126..0000000
diff --git a/sapmachine_11.0.25-jre-ubuntu-24.04/Dockerfile b/sapmachine_11.0.25-jre-ubuntu-24.04/Dockerfile
deleted file mode 100644
index 0f7390b..0000000
diff --git a/sapmachine_11.0.26-jdk-headless-ubuntu-20.04/Dockerfile b/sapmachine_11.0.26-jdk-headless-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..b4aad0e
--- /dev/null
+++ b/sapmachine_11.0.26-jdk-headless-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jdk-headless=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_11.0.26-jdk-headless-ubuntu-22.04/Dockerfile b/sapmachine_11.0.26-jdk-headless-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..854eb81
--- /dev/null
+++ b/sapmachine_11.0.26-jdk-headless-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jdk-headless=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_11.0.26-jdk-headless-ubuntu-24.04/Dockerfile b/sapmachine_11.0.26-jdk-headless-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..ce0aae5
--- /dev/null
+++ b/sapmachine_11.0.26-jdk-headless-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jdk-headless=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_11.0.26-jdk-ubuntu-20.04/Dockerfile b/sapmachine_11.0.26-jdk-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..a95412e
--- /dev/null
+++ b/sapmachine_11.0.26-jdk-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jdk=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_11.0.26-jdk-ubuntu-22.04/Dockerfile b/sapmachine_11.0.26-jdk-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..fe78d20
--- /dev/null
+++ b/sapmachine_11.0.26-jdk-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jdk=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_11.0.26-jdk-ubuntu-24.04/Dockerfile b/sapmachine_11.0.26-jdk-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..9b1fee7
--- /dev/null
+++ b/sapmachine_11.0.26-jdk-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jdk=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_11.0.26-jre-headless-ubuntu-20.04/Dockerfile b/sapmachine_11.0.26-jre-headless-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..689dad5
--- /dev/null
+++ b/sapmachine_11.0.26-jre-headless-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jre-headless=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_11.0.26-jre-headless-ubuntu-22.04/Dockerfile b/sapmachine_11.0.26-jre-headless-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..ca0de14
--- /dev/null
+++ b/sapmachine_11.0.26-jre-headless-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jre-headless=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_11.0.26-jre-headless-ubuntu-24.04/Dockerfile b/sapmachine_11.0.26-jre-headless-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..30dd125
--- /dev/null
+++ b/sapmachine_11.0.26-jre-headless-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jre-headless=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_11.0.26-jre-ubuntu-20.04/Dockerfile b/sapmachine_11.0.26-jre-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..34bf129
--- /dev/null
+++ b/sapmachine_11.0.26-jre-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jre=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_11.0.26-jre-ubuntu-22.04/Dockerfile b/sapmachine_11.0.26-jre-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..6f85303
--- /dev/null
+++ b/sapmachine_11.0.26-jre-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jre=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_11.0.26-jre-ubuntu-24.04/Dockerfile b/sapmachine_11.0.26-jre-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..9679bb2
--- /dev/null
+++ b/sapmachine_11.0.26-jre-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-11-jre=11.0.26 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.13-jdk-headless-ubuntu-20.04/Dockerfile b/sapmachine_17.0.13-jdk-headless-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 81d0afc..0000000
diff --git a/sapmachine_17.0.13-jdk-headless-ubuntu-22.04/Dockerfile b/sapmachine_17.0.13-jdk-headless-ubuntu-22.04/Dockerfile
deleted file mode 100644
index e2758db..0000000
diff --git a/sapmachine_17.0.13-jdk-headless-ubuntu-24.04/Dockerfile b/sapmachine_17.0.13-jdk-headless-ubuntu-24.04/Dockerfile
deleted file mode 100644
index 25a8df0..0000000
diff --git a/sapmachine_17.0.13-jdk-ubuntu-20.04/Dockerfile b/sapmachine_17.0.13-jdk-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 3846c00..0000000
diff --git a/sapmachine_17.0.13-jdk-ubuntu-22.04/Dockerfile b/sapmachine_17.0.13-jdk-ubuntu-22.04/Dockerfile
deleted file mode 100644
index dc243a0..0000000
diff --git a/sapmachine_17.0.13-jdk-ubuntu-24.04/Dockerfile b/sapmachine_17.0.13-jdk-ubuntu-24.04/Dockerfile
deleted file mode 100644
index 6b1363d..0000000
diff --git a/sapmachine_17.0.13-jre-headless-ubuntu-20.04/Dockerfile b/sapmachine_17.0.13-jre-headless-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 58397a6..0000000
diff --git a/sapmachine_17.0.13-jre-headless-ubuntu-22.04/Dockerfile b/sapmachine_17.0.13-jre-headless-ubuntu-22.04/Dockerfile
deleted file mode 100644
index 9d7e0e7..0000000
diff --git a/sapmachine_17.0.13-jre-headless-ubuntu-24.04/Dockerfile b/sapmachine_17.0.13-jre-headless-ubuntu-24.04/Dockerfile
deleted file mode 100644
index 4f555fc..0000000
diff --git a/sapmachine_17.0.13-jre-ubuntu-20.04/Dockerfile b/sapmachine_17.0.13-jre-ubuntu-20.04/Dockerfile
deleted file mode 100644
index a7f51b4..0000000
diff --git a/sapmachine_17.0.13-jre-ubuntu-22.04/Dockerfile b/sapmachine_17.0.13-jre-ubuntu-22.04/Dockerfile
deleted file mode 100644
index 8797d3a..0000000
diff --git a/sapmachine_17.0.13-jre-ubuntu-24.04/Dockerfile b/sapmachine_17.0.13-jre-ubuntu-24.04/Dockerfile
deleted file mode 100644
index d7f0c60..0000000
diff --git a/sapmachine_17.0.14-jdk-alpine-3.21/Dockerfile b/sapmachine_17.0.14-jdk-alpine-3.21/Dockerfile
new file mode 100644
index 0000000..1b9931c
--- /dev/null
+++ b/sapmachine_17.0.14-jdk-alpine-3.21/Dockerfile
@@ -0,0 +1,10 @@
+FROM alpine:3.21
+
+RUN wget -qO /etc/apk/keys/sapmachine-apk.rsa.pub https://dist.sapmachine.io/alpine/sapmachine-apk.rsa.pub && \
+    echo "4444e47cabf35695f9406692848de191d3b7cbd47dcdc1ffb62f4f70aea06e89 /etc/apk/keys/sapmachine-apk.rsa.pub" | sha256sum -c - && \
+    echo "https://dist.sapmachine.io/alpine" >> /etc/apk/repositories && \
+    apk add sapmachine-17-jdk=17.0.14-r0
+
+ENV JAVA_HOME=/usr/lib/jvm/java-17-sapmachine-jdk
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jdk-headless-ubuntu-20.04/Dockerfile b/sapmachine_17.0.14-jdk-headless-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..444ed0c
--- /dev/null
+++ b/sapmachine_17.0.14-jdk-headless-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jdk-headless=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jdk-headless-ubuntu-22.04/Dockerfile b/sapmachine_17.0.14-jdk-headless-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..9af8868
--- /dev/null
+++ b/sapmachine_17.0.14-jdk-headless-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jdk-headless=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jdk-headless-ubuntu-24.04/Dockerfile b/sapmachine_17.0.14-jdk-headless-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..6737345
--- /dev/null
+++ b/sapmachine_17.0.14-jdk-headless-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jdk-headless=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jdk-ubuntu-20.04/Dockerfile b/sapmachine_17.0.14-jdk-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..5b5ffd3
--- /dev/null
+++ b/sapmachine_17.0.14-jdk-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jdk=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jdk-ubuntu-22.04/Dockerfile b/sapmachine_17.0.14-jdk-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..db60975
--- /dev/null
+++ b/sapmachine_17.0.14-jdk-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jdk=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jdk-ubuntu-24.04/Dockerfile b/sapmachine_17.0.14-jdk-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..437e32c
--- /dev/null
+++ b/sapmachine_17.0.14-jdk-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jdk=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jre-alpine-3.21/Dockerfile b/sapmachine_17.0.14-jre-alpine-3.21/Dockerfile
new file mode 100644
index 0000000..05fea65
--- /dev/null
+++ b/sapmachine_17.0.14-jre-alpine-3.21/Dockerfile
@@ -0,0 +1,10 @@
+FROM alpine:3.21
+
+RUN wget -qO /etc/apk/keys/sapmachine-apk.rsa.pub https://dist.sapmachine.io/alpine/sapmachine-apk.rsa.pub && \
+    echo "4444e47cabf35695f9406692848de191d3b7cbd47dcdc1ffb62f4f70aea06e89 /etc/apk/keys/sapmachine-apk.rsa.pub" | sha256sum -c - && \
+    echo "https://dist.sapmachine.io/alpine" >> /etc/apk/repositories && \
+    apk add sapmachine-17-jre=17.0.14-r0
+
+ENV JAVA_HOME=/usr/lib/jvm/java-17-sapmachine-jre
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jre-headless-ubuntu-20.04/Dockerfile b/sapmachine_17.0.14-jre-headless-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..b0529c6
--- /dev/null
+++ b/sapmachine_17.0.14-jre-headless-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jre-headless=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jre-headless-ubuntu-22.04/Dockerfile b/sapmachine_17.0.14-jre-headless-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..973ff68
--- /dev/null
+++ b/sapmachine_17.0.14-jre-headless-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jre-headless=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jre-headless-ubuntu-24.04/Dockerfile b/sapmachine_17.0.14-jre-headless-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..201e5bd
--- /dev/null
+++ b/sapmachine_17.0.14-jre-headless-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jre-headless=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jre-ubuntu-20.04/Dockerfile b/sapmachine_17.0.14-jre-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..59f0133
--- /dev/null
+++ b/sapmachine_17.0.14-jre-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jre=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jre-ubuntu-22.04/Dockerfile b/sapmachine_17.0.14-jre-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..b87902b
--- /dev/null
+++ b/sapmachine_17.0.14-jre-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jre=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_17.0.14-jre-ubuntu-24.04/Dockerfile b/sapmachine_17.0.14-jre-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..6ee69b7
--- /dev/null
+++ b/sapmachine_17.0.14-jre-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-17-jre=17.0.14 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.5-jdk-headless-ubuntu-20.04/Dockerfile b/sapmachine_21.0.5-jdk-headless-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 34488a3..0000000
diff --git a/sapmachine_21.0.5-jdk-headless-ubuntu-22.04/Dockerfile b/sapmachine_21.0.5-jdk-headless-ubuntu-22.04/Dockerfile
deleted file mode 100644
index 37fe755..0000000
diff --git a/sapmachine_21.0.5-jdk-headless-ubuntu-24.04/Dockerfile b/sapmachine_21.0.5-jdk-headless-ubuntu-24.04/Dockerfile
deleted file mode 100644
index 08e47bc..0000000
diff --git a/sapmachine_21.0.5-jdk-ubuntu-20.04/Dockerfile b/sapmachine_21.0.5-jdk-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 42da83c..0000000
diff --git a/sapmachine_21.0.5-jdk-ubuntu-22.04/Dockerfile b/sapmachine_21.0.5-jdk-ubuntu-22.04/Dockerfile
deleted file mode 100644
index 397fb01..0000000
diff --git a/sapmachine_21.0.5-jdk-ubuntu-24.04/Dockerfile b/sapmachine_21.0.5-jdk-ubuntu-24.04/Dockerfile
deleted file mode 100644
index a646c52..0000000
diff --git a/sapmachine_21.0.5-jre-headless-ubuntu-20.04/Dockerfile b/sapmachine_21.0.5-jre-headless-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 7176614..0000000
diff --git a/sapmachine_21.0.5-jre-headless-ubuntu-22.04/Dockerfile b/sapmachine_21.0.5-jre-headless-ubuntu-22.04/Dockerfile
deleted file mode 100644
index afdf0d3..0000000
diff --git a/sapmachine_21.0.5-jre-headless-ubuntu-24.04/Dockerfile b/sapmachine_21.0.5-jre-headless-ubuntu-24.04/Dockerfile
deleted file mode 100644
index ff9a464..0000000
diff --git a/sapmachine_21.0.5-jre-ubuntu-20.04/Dockerfile b/sapmachine_21.0.5-jre-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 3c52103..0000000
diff --git a/sapmachine_21.0.5-jre-ubuntu-22.04/Dockerfile b/sapmachine_21.0.5-jre-ubuntu-22.04/Dockerfile
deleted file mode 100644
index 839b276..0000000
diff --git a/sapmachine_21.0.5-jre-ubuntu-24.04/Dockerfile b/sapmachine_21.0.5-jre-ubuntu-24.04/Dockerfile
deleted file mode 100644
index 43b0d43..0000000
diff --git a/sapmachine_21.0.6-jdk-alpine-3.21/Dockerfile b/sapmachine_21.0.6-jdk-alpine-3.21/Dockerfile
new file mode 100644
index 0000000..780839c
--- /dev/null
+++ b/sapmachine_21.0.6-jdk-alpine-3.21/Dockerfile
@@ -0,0 +1,10 @@
+FROM alpine:3.21
+
+RUN wget -qO /etc/apk/keys/sapmachine-apk.rsa.pub https://dist.sapmachine.io/alpine/sapmachine-apk.rsa.pub && \
+    echo "4444e47cabf35695f9406692848de191d3b7cbd47dcdc1ffb62f4f70aea06e89 /etc/apk/keys/sapmachine-apk.rsa.pub" | sha256sum -c - && \
+    echo "https://dist.sapmachine.io/alpine" >> /etc/apk/repositories && \
+    apk add sapmachine-21-jdk=21.0.6-r0
+
+ENV JAVA_HOME=/usr/lib/jvm/java-21-sapmachine-jdk
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jdk-headless-ubuntu-20.04/Dockerfile b/sapmachine_21.0.6-jdk-headless-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..e965554
--- /dev/null
+++ b/sapmachine_21.0.6-jdk-headless-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jdk-headless=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jdk-headless-ubuntu-22.04/Dockerfile b/sapmachine_21.0.6-jdk-headless-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..7a0b03e
--- /dev/null
+++ b/sapmachine_21.0.6-jdk-headless-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jdk-headless=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jdk-headless-ubuntu-24.04/Dockerfile b/sapmachine_21.0.6-jdk-headless-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..40067a9
--- /dev/null
+++ b/sapmachine_21.0.6-jdk-headless-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jdk-headless=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jdk-ubuntu-20.04/Dockerfile b/sapmachine_21.0.6-jdk-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..90a4477
--- /dev/null
+++ b/sapmachine_21.0.6-jdk-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jdk=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jdk-ubuntu-22.04/Dockerfile b/sapmachine_21.0.6-jdk-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..902eea9
--- /dev/null
+++ b/sapmachine_21.0.6-jdk-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jdk=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jdk-ubuntu-24.04/Dockerfile b/sapmachine_21.0.6-jdk-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..cd75888
--- /dev/null
+++ b/sapmachine_21.0.6-jdk-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jdk=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jre-alpine-3.21/Dockerfile b/sapmachine_21.0.6-jre-alpine-3.21/Dockerfile
new file mode 100644
index 0000000..03c3365
--- /dev/null
+++ b/sapmachine_21.0.6-jre-alpine-3.21/Dockerfile
@@ -0,0 +1,10 @@
+FROM alpine:3.21
+
+RUN wget -qO /etc/apk/keys/sapmachine-apk.rsa.pub https://dist.sapmachine.io/alpine/sapmachine-apk.rsa.pub && \
+    echo "4444e47cabf35695f9406692848de191d3b7cbd47dcdc1ffb62f4f70aea06e89 /etc/apk/keys/sapmachine-apk.rsa.pub" | sha256sum -c - && \
+    echo "https://dist.sapmachine.io/alpine" >> /etc/apk/repositories && \
+    apk add sapmachine-21-jre=21.0.6-r0
+
+ENV JAVA_HOME=/usr/lib/jvm/java-21-sapmachine-jre
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jre-headless-ubuntu-20.04/Dockerfile b/sapmachine_21.0.6-jre-headless-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..33dec89
--- /dev/null
+++ b/sapmachine_21.0.6-jre-headless-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jre-headless=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jre-headless-ubuntu-22.04/Dockerfile b/sapmachine_21.0.6-jre-headless-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..aee8039
--- /dev/null
+++ b/sapmachine_21.0.6-jre-headless-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jre-headless=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jre-headless-ubuntu-24.04/Dockerfile b/sapmachine_21.0.6-jre-headless-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..408976f
--- /dev/null
+++ b/sapmachine_21.0.6-jre-headless-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jre-headless=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jre-ubuntu-20.04/Dockerfile b/sapmachine_21.0.6-jre-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..d87d6db
--- /dev/null
+++ b/sapmachine_21.0.6-jre-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jre=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jre-ubuntu-22.04/Dockerfile b/sapmachine_21.0.6-jre-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..3424ff4
--- /dev/null
+++ b/sapmachine_21.0.6-jre-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jre=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_21.0.6-jre-ubuntu-24.04/Dockerfile b/sapmachine_21.0.6-jre-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..17a5e4a
--- /dev/null
+++ b/sapmachine_21.0.6-jre-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-21-jre=21.0.6 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-21
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.1-jdk-headless-ubuntu-20.04/Dockerfile b/sapmachine_23.0.1-jdk-headless-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 20c57b0..0000000
diff --git a/sapmachine_23.0.1-jdk-headless-ubuntu-22.04/Dockerfile b/sapmachine_23.0.1-jdk-headless-ubuntu-22.04/Dockerfile
deleted file mode 100644
index 0996788..0000000
diff --git a/sapmachine_23.0.1-jdk-headless-ubuntu-24.04/Dockerfile b/sapmachine_23.0.1-jdk-headless-ubuntu-24.04/Dockerfile
deleted file mode 100644
index c7d2db2..0000000
diff --git a/sapmachine_23.0.1-jdk-ubuntu-20.04/Dockerfile b/sapmachine_23.0.1-jdk-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 0e43364..0000000
diff --git a/sapmachine_23.0.1-jdk-ubuntu-22.04/Dockerfile b/sapmachine_23.0.1-jdk-ubuntu-22.04/Dockerfile
deleted file mode 100644
index d143f90..0000000
diff --git a/sapmachine_23.0.1-jdk-ubuntu-24.04/Dockerfile b/sapmachine_23.0.1-jdk-ubuntu-24.04/Dockerfile
deleted file mode 100644
index bb110da..0000000
diff --git a/sapmachine_23.0.1-jre-headless-ubuntu-20.04/Dockerfile b/sapmachine_23.0.1-jre-headless-ubuntu-20.04/Dockerfile
deleted file mode 100644
index c510a6a..0000000
diff --git a/sapmachine_23.0.1-jre-headless-ubuntu-22.04/Dockerfile b/sapmachine_23.0.1-jre-headless-ubuntu-22.04/Dockerfile
deleted file mode 100644
index 5f5e90c..0000000
diff --git a/sapmachine_23.0.1-jre-headless-ubuntu-24.04/Dockerfile b/sapmachine_23.0.1-jre-headless-ubuntu-24.04/Dockerfile
deleted file mode 100644
index 6608576..0000000
diff --git a/sapmachine_23.0.1-jre-ubuntu-20.04/Dockerfile b/sapmachine_23.0.1-jre-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 6ae8555..0000000
diff --git a/sapmachine_23.0.1-jre-ubuntu-22.04/Dockerfile b/sapmachine_23.0.1-jre-ubuntu-22.04/Dockerfile
deleted file mode 100644
index a9731b8..0000000
diff --git a/sapmachine_23.0.1-jre-ubuntu-24.04/Dockerfile b/sapmachine_23.0.1-jre-ubuntu-24.04/Dockerfile
deleted file mode 100644
index a1ed09b..0000000
diff --git a/sapmachine_23.0.2-jdk-alpine-3.21/Dockerfile b/sapmachine_23.0.2-jdk-alpine-3.21/Dockerfile
new file mode 100644
index 0000000..fbe44f9
--- /dev/null
+++ b/sapmachine_23.0.2-jdk-alpine-3.21/Dockerfile
@@ -0,0 +1,10 @@
+FROM alpine:3.21
+
+RUN wget -qO /etc/apk/keys/sapmachine-apk.rsa.pub https://dist.sapmachine.io/alpine/sapmachine-apk.rsa.pub && \
+    echo "4444e47cabf35695f9406692848de191d3b7cbd47dcdc1ffb62f4f70aea06e89 /etc/apk/keys/sapmachine-apk.rsa.pub" | sha256sum -c - && \
+    echo "https://dist.sapmachine.io/alpine" >> /etc/apk/repositories && \
+    apk add sapmachine-23-jdk=23.0.2-r0
+
+ENV JAVA_HOME=/usr/lib/jvm/java-23-sapmachine-jdk
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jdk-headless-ubuntu-20.04/Dockerfile b/sapmachine_23.0.2-jdk-headless-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..ee9eb50
--- /dev/null
+++ b/sapmachine_23.0.2-jdk-headless-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jdk-headless=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jdk-headless-ubuntu-22.04/Dockerfile b/sapmachine_23.0.2-jdk-headless-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..587c692
--- /dev/null
+++ b/sapmachine_23.0.2-jdk-headless-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jdk-headless=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jdk-headless-ubuntu-24.04/Dockerfile b/sapmachine_23.0.2-jdk-headless-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..c85a042
--- /dev/null
+++ b/sapmachine_23.0.2-jdk-headless-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jdk-headless=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jdk-ubuntu-20.04/Dockerfile b/sapmachine_23.0.2-jdk-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..f290f9b
--- /dev/null
+++ b/sapmachine_23.0.2-jdk-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jdk=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jdk-ubuntu-22.04/Dockerfile b/sapmachine_23.0.2-jdk-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..03b6104
--- /dev/null
+++ b/sapmachine_23.0.2-jdk-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jdk=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jdk-ubuntu-24.04/Dockerfile b/sapmachine_23.0.2-jdk-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..ca89b8d
--- /dev/null
+++ b/sapmachine_23.0.2-jdk-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jdk=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jre-alpine-3.21/Dockerfile b/sapmachine_23.0.2-jre-alpine-3.21/Dockerfile
new file mode 100644
index 0000000..d3e57a1
--- /dev/null
+++ b/sapmachine_23.0.2-jre-alpine-3.21/Dockerfile
@@ -0,0 +1,10 @@
+FROM alpine:3.21
+
+RUN wget -qO /etc/apk/keys/sapmachine-apk.rsa.pub https://dist.sapmachine.io/alpine/sapmachine-apk.rsa.pub && \
+    echo "4444e47cabf35695f9406692848de191d3b7cbd47dcdc1ffb62f4f70aea06e89 /etc/apk/keys/sapmachine-apk.rsa.pub" | sha256sum -c - && \
+    echo "https://dist.sapmachine.io/alpine" >> /etc/apk/repositories && \
+    apk add sapmachine-23-jre=23.0.2-r0
+
+ENV JAVA_HOME=/usr/lib/jvm/java-23-sapmachine-jre
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jre-headless-ubuntu-20.04/Dockerfile b/sapmachine_23.0.2-jre-headless-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..df61754
--- /dev/null
+++ b/sapmachine_23.0.2-jre-headless-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jre-headless=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jre-headless-ubuntu-22.04/Dockerfile b/sapmachine_23.0.2-jre-headless-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..9311d31
--- /dev/null
+++ b/sapmachine_23.0.2-jre-headless-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jre-headless=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jre-headless-ubuntu-24.04/Dockerfile b/sapmachine_23.0.2-jre-headless-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..95645a2
--- /dev/null
+++ b/sapmachine_23.0.2-jre-headless-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jre-headless=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jre-ubuntu-20.04/Dockerfile b/sapmachine_23.0.2-jre-ubuntu-20.04/Dockerfile
new file mode 100644
index 0000000..d3b08df
--- /dev/null
+++ b/sapmachine_23.0.2-jre-ubuntu-20.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jre=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jre-ubuntu-22.04/Dockerfile b/sapmachine_23.0.2-jre-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..376be5f
--- /dev/null
+++ b/sapmachine_23.0.2-jre-ubuntu-22.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jre=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]
diff --git a/sapmachine_23.0.2-jre-ubuntu-24.04/Dockerfile b/sapmachine_23.0.2-jre-ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..0dbd18c
--- /dev/null
+++ b/sapmachine_23.0.2-jre-ubuntu-24.04/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates gnupg && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys CACB9FE09150307D1D22D82962754C3B3ABCFE23 && \
+    chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg && \
+    echo "deb http://dist.sapmachine.io/debian/$(dpkg --print-architecture)/ ./" > /etc/apt/sources.list.d/sapmachine.list && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install sapmachine-23-jre=23.0.2 && \
+    apt-get remove -y --purge --autoremove ca-certificates gnupg && \
+    rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
+
+CMD ["jshell"]

Relevant Maintainers:

@RealCLanger
Copy link
Contributor Author 

+RUN wget -qO /etc/apk/keys/sapmachine-apk.rsa.pub https://dist.sapmachine.io/alpine/sapmachine-apk.rsa.pub \
+    && echo "https://dist.sapmachine.io/alpine" >> /etc/apk/repositories \
+    && apk add sapmachine-17-jdk=17.0.14-r0

https://github.com/docker-library/official-images/blob/c3f2c2303685ddc3d8c0a1800568f2d171ad6924/README.md#image-build

Can you add some verification of the key download in the Alpine images? Either an embedded SHA check ( echo "[insert shasum] *sapmachine-apk.rsa.pub" | sha256sum --strict -c) or fetching via gpg like the Ubuntu images. The embedded checksum will also help provide a natural cache bust when the key is updated for expiration, for example.

I added the verification of the key's sha256sum.

@yosifkit yosifkit merged commit f38d6a9 into docker-library:master Jan 27, 2025
59 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/sapmachine
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@RealCLanger @tianon @yosifkit