Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Added SapMachine 23 #17594

Merged
merged 1 commit into from
Sep 20, 2024
Merged

Added SapMachine 23 #17594

merged 1 commit into from
Sep 20, 2024

Conversation

chalstrick
Copy link
Contributor

No description provided.

Copy link

Diff for f5115b7:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index cac9543..d3ecb93 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -181,62 +181,62 @@ Architectures: amd64, arm64v8, ppc64le
 GitCommit: 8d0461ef7008c90ebe0738cf906144ba6e8fec1a
 Directory: dockerfiles/21/ubuntu/22_04/jdk
 
-Tags: 22-jdk-headless-ubuntu-focal, 22-jdk-headless-ubuntu-20.04, jdk-headless-ubuntu-focal, jdk-headless-ubuntu-20.04, 22.0.2-jdk-headless-ubuntu-focal, 22.0.2-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
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/20_04/jdk-headless
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/20_04/jdk-headless
 
-Tags: 22-jdk-headless-ubuntu-jammy, 22-jdk-headless-ubuntu-22.04, jdk-headless-ubuntu-jammy, jdk-headless-ubuntu-22.04, 22.0.2-jdk-headless-ubuntu-jammy, 22.0.2-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
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/22_04/jdk-headless
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/22_04/jdk-headless
 
-Tags: 22-jre-headless-ubuntu-focal, 22-jre-headless-ubuntu-20.04, jre-headless-ubuntu-focal, jre-headless-ubuntu-20.04, 22.0.2-jre-headless-ubuntu-focal, 22.0.2-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
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/20_04/jre-headless
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/20_04/jre-headless
 
-Tags: 22-jre-headless-ubuntu-jammy, 22-jre-headless-ubuntu-22.04, jre-headless-ubuntu-jammy, jre-headless-ubuntu-22.04, 22.0.2-jre-headless-ubuntu-jammy, 22.0.2-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
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/22_04/jre-headless
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/22_04/jre-headless
 
-Tags: 22-jre-ubuntu-focal, 22-jre-ubuntu-20.04, jre-ubuntu-focal, jre-ubuntu-20.04, 22.0.2-jre-ubuntu-focal, 22.0.2-jre-ubuntu-20.04
+Tags: 23-jre-ubuntu-focal, 23-jre-ubuntu-20.04, jre-ubuntu-focal, jre-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/20_04/jre
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/20_04/jre
 
-Tags: 22-jre-ubuntu-jammy, 22-jre-ubuntu-22.04, jre-ubuntu-jammy, jre-ubuntu-22.04, 22.0.2-jre-ubuntu-jammy, 22.0.2-jre-ubuntu-22.04
+Tags: 23-jre-ubuntu-jammy, 23-jre-ubuntu-22.04, jre-ubuntu-jammy, jre-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/22_04/jre
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/22_04/jre
 
-Tags: jdk-headless-ubuntu, 22-jdk-headless-ubuntu, 22.0.2-jdk-headless-ubuntu, 22-jdk-headless-ubuntu-noble, 22-jdk-headless-ubuntu-24.04, jdk-headless-ubuntu-noble, jdk-headless-ubuntu-24.04, 22.0.2-jdk-headless-ubuntu-noble, 22.0.2-jdk-headless-ubuntu-24.04
+Tags: jdk-headless-ubuntu, 23-jdk-headless-ubuntu, 23-jdk-headless-ubuntu-noble, 23-jdk-headless-ubuntu-24.04, jdk-headless-ubuntu-noble, jdk-headless-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/24_04/jdk-headless
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/24_04/jdk-headless
 
-Tags: jre-headless-ubuntu, 22-jre-headless-ubuntu, 22.0.2-jre-headless-ubuntu, 22-jre-headless-ubuntu-noble, 22-jre-headless-ubuntu-24.04, jre-headless-ubuntu-noble, jre-headless-ubuntu-24.04, 22.0.2-jre-headless-ubuntu-noble, 22.0.2-jre-headless-ubuntu-24.04
+Tags: jre-headless-ubuntu, 23-jre-headless-ubuntu, 23-jre-headless-ubuntu-noble, 23-jre-headless-ubuntu-24.04, jre-headless-ubuntu-noble, jre-headless-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/24_04/jre-headless
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/24_04/jre-headless
 
-Tags: jre-ubuntu, 22-jre-ubuntu, 22.0.2-jre-ubuntu, 22-jre-ubuntu-noble, 22-jre-ubuntu-24.04, jre-ubuntu-noble, jre-ubuntu-24.04, 22.0.2-jre-ubuntu-noble, 22.0.2-jre-ubuntu-24.04
+Tags: jre-ubuntu, 23-jre-ubuntu, 23-jre-ubuntu-noble, 23-jre-ubuntu-24.04, jre-ubuntu-noble, jre-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/24_04/jre
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/24_04/jre
 
-Tags: latest, jdk-ubuntu, 22, 22-jdk-ubuntu, 22.0.2, 22.0.2-jdk-ubuntu, ubuntu-noble, ubuntu-24.04, 22-ubuntu-noble, 22-ubuntu-24.04, 22.0.2-ubuntu-noble, 22.0.2-ubuntu-24.04, 22-jdk-ubuntu-noble, 22-jdk-ubuntu-24.04, jdk-ubuntu-noble, jdk-ubuntu-24.04, 22.0.2-jdk-ubuntu-noble, 22.0.2-jdk-ubuntu-24.04
+Tags: latest, jdk-ubuntu, 23, 23-jdk-ubuntu, ubuntu-noble, ubuntu-24.04, 23-ubuntu-noble, 23-ubuntu-24.04, 23-jdk-ubuntu-noble, 23-jdk-ubuntu-24.04, jdk-ubuntu-noble, jdk-ubuntu-24.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/24_04/jdk
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/24_04/jdk
 
-Tags: ubuntu-focal, ubuntu-20.04, 22-ubuntu-focal, 22-ubuntu-20.04, 22.0.2-ubuntu-focal, 22.0.2-ubuntu-20.04, 22-jdk-ubuntu-focal, 22-jdk-ubuntu-20.04, jdk-ubuntu-focal, jdk-ubuntu-20.04, 22.0.2-jdk-ubuntu-focal, 22.0.2-jdk-ubuntu-20.04
+Tags: ubuntu-focal, ubuntu-20.04, 23-ubuntu-focal, 23-ubuntu-20.04, 23-jdk-ubuntu-focal, 23-jdk-ubuntu-20.04, jdk-ubuntu-focal, jdk-ubuntu-20.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/20_04/jdk
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/20_04/jdk
 
-Tags: ubuntu-jammy, ubuntu-22.04, 22-ubuntu-jammy, 22-ubuntu-22.04, 22.0.2-ubuntu-jammy, 22.0.2-ubuntu-22.04, 22-jdk-ubuntu-jammy, 22-jdk-ubuntu-22.04, jdk-ubuntu-jammy, jdk-ubuntu-22.04, 22.0.2-jdk-ubuntu-jammy, 22.0.2-jdk-ubuntu-22.04
+Tags: ubuntu-jammy, ubuntu-22.04, 23-ubuntu-jammy, 23-ubuntu-22.04, 23-jdk-ubuntu-jammy, 23-jdk-ubuntu-22.04, jdk-ubuntu-jammy, jdk-ubuntu-22.04
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 32fcb19238cd9f713502f38a2f2b51cd2bffdba5
-Directory: dockerfiles/22/ubuntu/22_04/jdk
+GitCommit: 0c7d01a1dcc6009590411793978369247968324e
+Directory: dockerfiles/23/ubuntu/22_04/jdk
diff --git a/_bashbrew-list b/_bashbrew-list
index 0f9ec1d..9df8b09 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -208,76 +208,41 @@ sapmachine:21.0.4-ubuntu-24.04
 sapmachine:21.0.4-ubuntu-focal
 sapmachine:21.0.4-ubuntu-jammy
 sapmachine:21.0.4-ubuntu-noble
-sapmachine:22
-sapmachine:22-jdk-headless-ubuntu
-sapmachine:22-jdk-headless-ubuntu-20.04
-sapmachine:22-jdk-headless-ubuntu-22.04
-sapmachine:22-jdk-headless-ubuntu-24.04
-sapmachine:22-jdk-headless-ubuntu-focal
-sapmachine:22-jdk-headless-ubuntu-jammy
-sapmachine:22-jdk-headless-ubuntu-noble
-sapmachine:22-jdk-ubuntu
-sapmachine:22-jdk-ubuntu-20.04
-sapmachine:22-jdk-ubuntu-22.04
-sapmachine:22-jdk-ubuntu-24.04
-sapmachine:22-jdk-ubuntu-focal
-sapmachine:22-jdk-ubuntu-jammy
-sapmachine:22-jdk-ubuntu-noble
-sapmachine:22-jre-headless-ubuntu
-sapmachine:22-jre-headless-ubuntu-20.04
-sapmachine:22-jre-headless-ubuntu-22.04
-sapmachine:22-jre-headless-ubuntu-24.04
-sapmachine:22-jre-headless-ubuntu-focal
-sapmachine:22-jre-headless-ubuntu-jammy
-sapmachine:22-jre-headless-ubuntu-noble
-sapmachine:22-jre-ubuntu
-sapmachine:22-jre-ubuntu-20.04
-sapmachine:22-jre-ubuntu-22.04
-sapmachine:22-jre-ubuntu-24.04
-sapmachine:22-jre-ubuntu-focal
-sapmachine:22-jre-ubuntu-jammy
-sapmachine:22-jre-ubuntu-noble
-sapmachine:22-ubuntu-20.04
-sapmachine:22-ubuntu-22.04
-sapmachine:22-ubuntu-24.04
-sapmachine:22-ubuntu-focal
-sapmachine:22-ubuntu-jammy
-sapmachine:22-ubuntu-noble
-sapmachine:22.0.2
-sapmachine:22.0.2-jdk-headless-ubuntu
-sapmachine:22.0.2-jdk-headless-ubuntu-20.04
-sapmachine:22.0.2-jdk-headless-ubuntu-22.04
-sapmachine:22.0.2-jdk-headless-ubuntu-24.04
-sapmachine:22.0.2-jdk-headless-ubuntu-focal
-sapmachine:22.0.2-jdk-headless-ubuntu-jammy
-sapmachine:22.0.2-jdk-headless-ubuntu-noble
-sapmachine:22.0.2-jdk-ubuntu
-sapmachine:22.0.2-jdk-ubuntu-20.04
-sapmachine:22.0.2-jdk-ubuntu-22.04
-sapmachine:22.0.2-jdk-ubuntu-24.04
-sapmachine:22.0.2-jdk-ubuntu-focal
-sapmachine:22.0.2-jdk-ubuntu-jammy
-sapmachine:22.0.2-jdk-ubuntu-noble
-sapmachine:22.0.2-jre-headless-ubuntu
-sapmachine:22.0.2-jre-headless-ubuntu-20.04
-sapmachine:22.0.2-jre-headless-ubuntu-22.04
-sapmachine:22.0.2-jre-headless-ubuntu-24.04
-sapmachine:22.0.2-jre-headless-ubuntu-focal
-sapmachine:22.0.2-jre-headless-ubuntu-jammy
-sapmachine:22.0.2-jre-headless-ubuntu-noble
-sapmachine:22.0.2-jre-ubuntu
-sapmachine:22.0.2-jre-ubuntu-20.04
-sapmachine:22.0.2-jre-ubuntu-22.04
-sapmachine:22.0.2-jre-ubuntu-24.04
-sapmachine:22.0.2-jre-ubuntu-focal
-sapmachine:22.0.2-jre-ubuntu-jammy
-sapmachine:22.0.2-jre-ubuntu-noble
-sapmachine:22.0.2-ubuntu-20.04
-sapmachine:22.0.2-ubuntu-22.04
-sapmachine:22.0.2-ubuntu-24.04
-sapmachine:22.0.2-ubuntu-focal
-sapmachine:22.0.2-ubuntu-jammy
-sapmachine:22.0.2-ubuntu-noble
+sapmachine:23
+sapmachine:23-jdk-headless-ubuntu
+sapmachine:23-jdk-headless-ubuntu-20.04
+sapmachine:23-jdk-headless-ubuntu-22.04
+sapmachine:23-jdk-headless-ubuntu-24.04
+sapmachine:23-jdk-headless-ubuntu-focal
+sapmachine:23-jdk-headless-ubuntu-jammy
+sapmachine:23-jdk-headless-ubuntu-noble
+sapmachine:23-jdk-ubuntu
+sapmachine:23-jdk-ubuntu-20.04
+sapmachine:23-jdk-ubuntu-22.04
+sapmachine:23-jdk-ubuntu-24.04
+sapmachine:23-jdk-ubuntu-focal
+sapmachine:23-jdk-ubuntu-jammy
+sapmachine:23-jdk-ubuntu-noble
+sapmachine:23-jre-headless-ubuntu
+sapmachine:23-jre-headless-ubuntu-20.04
+sapmachine:23-jre-headless-ubuntu-22.04
+sapmachine:23-jre-headless-ubuntu-24.04
+sapmachine:23-jre-headless-ubuntu-focal
+sapmachine:23-jre-headless-ubuntu-jammy
+sapmachine:23-jre-headless-ubuntu-noble
+sapmachine:23-jre-ubuntu
+sapmachine:23-jre-ubuntu-20.04
+sapmachine:23-jre-ubuntu-22.04
+sapmachine:23-jre-ubuntu-24.04
+sapmachine:23-jre-ubuntu-focal
+sapmachine:23-jre-ubuntu-jammy
+sapmachine:23-jre-ubuntu-noble
+sapmachine:23-ubuntu-20.04
+sapmachine:23-ubuntu-22.04
+sapmachine:23-ubuntu-24.04
+sapmachine:23-ubuntu-focal
+sapmachine:23-ubuntu-jammy
+sapmachine:23-ubuntu-noble
 sapmachine:jdk-headless-ubuntu
 sapmachine:jdk-headless-ubuntu-20.04
 sapmachine:jdk-headless-ubuntu-22.04
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 55db9c6..0532415 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -34,15 +34,15 @@ sapmachine:21.0.4-jre-headless-ubuntu-24.04
 sapmachine:21.0.4-jre-ubuntu-20.04
 sapmachine:21.0.4-jre-ubuntu-22.04
 sapmachine:21.0.4-jre-ubuntu-24.04
-sapmachine:22.0.2-jdk-headless-ubuntu-20.04
-sapmachine:22.0.2-jdk-headless-ubuntu-22.04
-sapmachine:22.0.2-jdk-headless-ubuntu-24.04
-sapmachine:22.0.2-jdk-ubuntu-20.04
-sapmachine:22.0.2-jdk-ubuntu-22.04
-sapmachine:22.0.2-jdk-ubuntu-24.04
-sapmachine:22.0.2-jre-headless-ubuntu-20.04
-sapmachine:22.0.2-jre-headless-ubuntu-22.04
-sapmachine:22.0.2-jre-headless-ubuntu-24.04
-sapmachine:22.0.2-jre-ubuntu-20.04
-sapmachine:22.0.2-jre-ubuntu-22.04
-sapmachine:22.0.2-jre-ubuntu-24.04
+sapmachine:jdk-headless-ubuntu-20.04
+sapmachine:jdk-headless-ubuntu-22.04
+sapmachine:jdk-headless-ubuntu-24.04
+sapmachine:jdk-ubuntu-20.04
+sapmachine:jdk-ubuntu-22.04
+sapmachine:jdk-ubuntu-24.04
+sapmachine:jre-headless-ubuntu-20.04
+sapmachine:jre-headless-ubuntu-22.04
+sapmachine:jre-headless-ubuntu-24.04
+sapmachine:jre-ubuntu-20.04
+sapmachine:jre-ubuntu-22.04
+sapmachine:jre-ubuntu-24.04
diff --git a/sapmachine_22.0.2-jdk-headless-ubuntu-20.04/Dockerfile b/sapmachine_22.0.2-jdk-headless-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 5c1a58a..0000000
diff --git a/sapmachine_22.0.2-jdk-headless-ubuntu-22.04/Dockerfile b/sapmachine_22.0.2-jdk-headless-ubuntu-22.04/Dockerfile
deleted file mode 100644
index 3118ca9..0000000
diff --git a/sapmachine_22.0.2-jdk-headless-ubuntu-24.04/Dockerfile b/sapmachine_22.0.2-jdk-headless-ubuntu-24.04/Dockerfile
deleted file mode 100644
index 1450d47..0000000
diff --git a/sapmachine_22.0.2-jre-headless-ubuntu-20.04/Dockerfile b/sapmachine_22.0.2-jre-headless-ubuntu-20.04/Dockerfile
deleted file mode 100644
index 9d52de6..0000000
diff --git a/sapmachine_22.0.2-jre-headless-ubuntu-22.04/Dockerfile b/sapmachine_22.0.2-jre-headless-ubuntu-22.04/Dockerfile
deleted file mode 100644
index db73210..0000000
diff --git a/sapmachine_22.0.2-jre-headless-ubuntu-24.04/Dockerfile b/sapmachine_22.0.2-jre-headless-ubuntu-24.04/Dockerfile
deleted file mode 100644
index deeef7f..0000000
diff --git a/sapmachine_17.0.12-jdk-ubuntu-20.04/Dockerfile b/sapmachine_jdk-headless-ubuntu-20.04/Dockerfile
similarity index 84%
copy from sapmachine_17.0.12-jdk-ubuntu-20.04/Dockerfile
copy to sapmachine_jdk-headless-ubuntu-20.04/Dockerfile
index 5b9901f..3ae1b6a 100644
--- a/sapmachine_17.0.12-jdk-ubuntu-20.04/Dockerfile
+++ b/sapmachine_jdk-headless-ubuntu-20.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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.12 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jdk-headless=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]
diff --git a/sapmachine_11.0.24-jdk-ubuntu-22.04/Dockerfile b/sapmachine_jdk-headless-ubuntu-22.04/Dockerfile
similarity index 84%
copy from sapmachine_11.0.24-jdk-ubuntu-22.04/Dockerfile
copy to sapmachine_jdk-headless-ubuntu-22.04/Dockerfile
index b0764e5..0b472c6 100644
--- a/sapmachine_11.0.24-jdk-ubuntu-22.04/Dockerfile
+++ b/sapmachine_jdk-headless-ubuntu-22.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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.24 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jdk-headless=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]
diff --git a/sapmachine_17.0.12-jdk-ubuntu-24.04/Dockerfile b/sapmachine_jdk-headless-ubuntu-24.04/Dockerfile
similarity index 84%
copy from sapmachine_17.0.12-jdk-ubuntu-24.04/Dockerfile
copy to sapmachine_jdk-headless-ubuntu-24.04/Dockerfile
index a31c316..3465967 100644
--- a/sapmachine_17.0.12-jdk-ubuntu-24.04/Dockerfile
+++ b/sapmachine_jdk-headless-ubuntu-24.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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.12 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jdk-headless=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]
diff --git a/sapmachine_22.0.2-jdk-ubuntu-20.04/Dockerfile b/sapmachine_jdk-ubuntu-20.04/Dockerfile
similarity index 85%
rename from sapmachine_22.0.2-jdk-ubuntu-20.04/Dockerfile
rename to sapmachine_jdk-ubuntu-20.04/Dockerfile
index 0477191..a09b486 100644
--- a/sapmachine_22.0.2-jdk-ubuntu-20.04/Dockerfile
+++ b/sapmachine_jdk-ubuntu-20.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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-22-jdk=22.0.2 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jdk=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-22
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]
diff --git a/sapmachine_22.0.2-jdk-ubuntu-22.04/Dockerfile b/sapmachine_jdk-ubuntu-22.04/Dockerfile
similarity index 85%
rename from sapmachine_22.0.2-jdk-ubuntu-22.04/Dockerfile
rename to sapmachine_jdk-ubuntu-22.04/Dockerfile
index 585c44f..9a9c0e0 100644
--- a/sapmachine_22.0.2-jdk-ubuntu-22.04/Dockerfile
+++ b/sapmachine_jdk-ubuntu-22.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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-22-jdk=22.0.2 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jdk=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-22
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]
diff --git a/sapmachine_22.0.2-jdk-ubuntu-24.04/Dockerfile b/sapmachine_jdk-ubuntu-24.04/Dockerfile
similarity index 85%
rename from sapmachine_22.0.2-jdk-ubuntu-24.04/Dockerfile
rename to sapmachine_jdk-ubuntu-24.04/Dockerfile
index 68f2174..78f9530 100644
--- a/sapmachine_22.0.2-jdk-ubuntu-24.04/Dockerfile
+++ b/sapmachine_jdk-ubuntu-24.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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-22-jdk=22.0.2 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jdk=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-22
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]
diff --git a/sapmachine_17.0.12-jdk-ubuntu-20.04/Dockerfile b/sapmachine_jre-headless-ubuntu-20.04/Dockerfile
similarity index 84%
copy from sapmachine_17.0.12-jdk-ubuntu-20.04/Dockerfile
copy to sapmachine_jre-headless-ubuntu-20.04/Dockerfile
index 5b9901f..47a36f1 100644
--- a/sapmachine_17.0.12-jdk-ubuntu-20.04/Dockerfile
+++ b/sapmachine_jre-headless-ubuntu-20.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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.12 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jre-headless=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]
diff --git a/sapmachine_11.0.24-jdk-ubuntu-22.04/Dockerfile b/sapmachine_jre-headless-ubuntu-22.04/Dockerfile
similarity index 84%
copy from sapmachine_11.0.24-jdk-ubuntu-22.04/Dockerfile
copy to sapmachine_jre-headless-ubuntu-22.04/Dockerfile
index b0764e5..8135e23 100644
--- a/sapmachine_11.0.24-jdk-ubuntu-22.04/Dockerfile
+++ b/sapmachine_jre-headless-ubuntu-22.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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.24 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jre-headless=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-11
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]
diff --git a/sapmachine_17.0.12-jdk-ubuntu-24.04/Dockerfile b/sapmachine_jre-headless-ubuntu-24.04/Dockerfile
similarity index 84%
copy from sapmachine_17.0.12-jdk-ubuntu-24.04/Dockerfile
copy to sapmachine_jre-headless-ubuntu-24.04/Dockerfile
index a31c316..a30d6cd 100644
--- a/sapmachine_17.0.12-jdk-ubuntu-24.04/Dockerfile
+++ b/sapmachine_jre-headless-ubuntu-24.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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.12 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jre-headless=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-17
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]
diff --git a/sapmachine_22.0.2-jre-ubuntu-20.04/Dockerfile b/sapmachine_jre-ubuntu-20.04/Dockerfile
similarity index 85%
rename from sapmachine_22.0.2-jre-ubuntu-20.04/Dockerfile
rename to sapmachine_jre-ubuntu-20.04/Dockerfile
index eb6b40f..05f28b6 100644
--- a/sapmachine_22.0.2-jre-ubuntu-20.04/Dockerfile
+++ b/sapmachine_jre-ubuntu-20.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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-22-jre=22.0.2 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jre=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-22
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]
diff --git a/sapmachine_22.0.2-jre-ubuntu-22.04/Dockerfile b/sapmachine_jre-ubuntu-22.04/Dockerfile
similarity index 85%
rename from sapmachine_22.0.2-jre-ubuntu-22.04/Dockerfile
rename to sapmachine_jre-ubuntu-22.04/Dockerfile
index 31dfd00..a917ef5 100644
--- a/sapmachine_22.0.2-jre-ubuntu-22.04/Dockerfile
+++ b/sapmachine_jre-ubuntu-22.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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-22-jre=22.0.2 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jre=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-22
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]
diff --git a/sapmachine_22.0.2-jre-ubuntu-24.04/Dockerfile b/sapmachine_jre-ubuntu-24.04/Dockerfile
similarity index 85%
rename from sapmachine_22.0.2-jre-ubuntu-24.04/Dockerfile
rename to sapmachine_jre-ubuntu-24.04/Dockerfile
index 6883f5e..39f25ea 100644
--- a/sapmachine_22.0.2-jre-ubuntu-24.04/Dockerfile
+++ b/sapmachine_jre-ubuntu-24.04/Dockerfile
@@ -7,10 +7,10 @@ RUN apt-get update \
     && 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-22-jre=22.0.2 \
+    && apt-get -y --no-install-recommends install sapmachine-23-jre=23 \
     && apt-get remove -y --purge --autoremove ca-certificates gnupg \
     && rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/sapmachine-22
+ENV JAVA_HOME=/usr/lib/jvm/sapmachine-23
 
 CMD ["jshell"]

Relevant Maintainers:

@yosifkit yosifkit merged commit 8acd60e into docker-library:master Sep 20, 2024
53 checks passed
@tianon
Copy link
Member

tianon commented Sep 20, 2024

Thank you for taking care of the 22 EOL too 🥹 ❤️

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

Successfully merging this pull request may close these issues.

3 participants