From c4359a51cb0fe7bc7e552f3e039a0e77947bbffc Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Date: Mon, 23 Sep 2024 18:32:56 +0200 Subject: [PATCH] feat: maven on Java 23 --- ...jammy.yml => amazoncorretto-23-al2023.yml} | 12 ++--- ...lpine.yml => amazoncorretto-23-debian.yml} | 12 ++--- ...e-temurin-22.yml => amazoncorretto-23.yml} | 12 ++--- .github/workflows/azulzulu-23-alpine.yml | 32 ++++++++++++++ .github/workflows/azulzulu-23-debian.yml | 32 ++++++++++++++ .../{sapmachine-22.yml => azulzulu-23.yml} | 12 ++--- .../workflows/eclipse-temurin-23-alpine.yml | 32 ++++++++++++++ .../workflows/eclipse-temurin-23-noble.yml | 32 ++++++++++++++ .github/workflows/eclipse-temurin-23.yml | 32 ++++++++++++++ .github/workflows/graalvm-community-23.yml | 32 ++++++++++++++ .github/workflows/ibm-semeru-23-jammy.yml | 32 ++++++++++++++ .github/workflows/oracle-graalvm-23.yml | 32 ++++++++++++++ .github/workflows/sapmachine-23.yml | 32 ++++++++++++++ README.md | 44 ++++++++++++------- amazoncorretto-23-al2023/Dockerfile | 24 ++++++++++ amazoncorretto-23-debian/Dockerfile | 41 +++++++++++++++++ amazoncorretto-23/Dockerfile | 24 ++++++++++ .../Dockerfile | 2 +- azulzulu-23-debian/Dockerfile | 26 +++++++++++ azulzulu-23/Dockerfile | 26 +++++++++++ eclipse-temurin-23-alpine/Dockerfile | 24 ++++++++++ .../Dockerfile | 2 +- .../Dockerfile | 2 +- graalvm-community-23/Dockerfile | 24 ++++++++++ ibm-semeru-23-jammy/Dockerfile | 26 +++++++++++ jdk-new-version.sh | 16 +++++++ oracle-graalvm-23/Dockerfile | 24 ++++++++++ {sapmachine-22 => sapmachine-23}/Dockerfile | 2 +- tests/tests.bats | 15 +++++-- 29 files changed, 610 insertions(+), 48 deletions(-) rename .github/workflows/{eclipse-temurin-22-jammy.yml => amazoncorretto-23-al2023.yml} (64%) rename .github/workflows/{eclipse-temurin-22-alpine.yml => amazoncorretto-23-debian.yml} (63%) rename .github/workflows/{eclipse-temurin-22.yml => amazoncorretto-23.yml} (67%) create mode 100644 .github/workflows/azulzulu-23-alpine.yml create mode 100644 .github/workflows/azulzulu-23-debian.yml rename .github/workflows/{sapmachine-22.yml => azulzulu-23.yml} (70%) create mode 100644 .github/workflows/eclipse-temurin-23-alpine.yml create mode 100644 .github/workflows/eclipse-temurin-23-noble.yml create mode 100644 .github/workflows/eclipse-temurin-23.yml create mode 100644 .github/workflows/graalvm-community-23.yml create mode 100644 .github/workflows/ibm-semeru-23-jammy.yml create mode 100644 .github/workflows/oracle-graalvm-23.yml create mode 100644 .github/workflows/sapmachine-23.yml create mode 100644 amazoncorretto-23-al2023/Dockerfile create mode 100644 amazoncorretto-23-debian/Dockerfile create mode 100644 amazoncorretto-23/Dockerfile rename {eclipse-temurin-22-alpine => azulzulu-23-alpine}/Dockerfile (96%) create mode 100644 azulzulu-23-debian/Dockerfile create mode 100644 azulzulu-23/Dockerfile create mode 100644 eclipse-temurin-23-alpine/Dockerfile rename {eclipse-temurin-22-jammy => eclipse-temurin-23-noble}/Dockerfile (97%) rename {eclipse-temurin-22 => eclipse-temurin-23}/Dockerfile (97%) create mode 100644 graalvm-community-23/Dockerfile create mode 100644 ibm-semeru-23-jammy/Dockerfile create mode 100755 jdk-new-version.sh create mode 100644 oracle-graalvm-23/Dockerfile rename {sapmachine-22 => sapmachine-23}/Dockerfile (98%) diff --git a/.github/workflows/eclipse-temurin-22-jammy.yml b/.github/workflows/amazoncorretto-23-al2023.yml similarity index 64% rename from .github/workflows/eclipse-temurin-22-jammy.yml rename to .github/workflows/amazoncorretto-23-al2023.yml index b4cc940b..9e1736e1 100644 --- a/.github/workflows/eclipse-temurin-22-jammy.yml +++ b/.github/workflows/amazoncorretto-23-al2023.yml @@ -1,12 +1,12 @@ -name: eclipse-temurin-22-jammy +name: amazoncorretto-23-al2023 on: push: branches: - main paths: - - "eclipse-temurin-22-jammy/**" - - .github/workflows/eclipse-temurin-22-jammy.yml + - "amazoncorretto-23-al2023/**" + - .github/workflows/amazoncorretto-23-al2023.yml - .github/workflows/_template.yml - common.sh - tags-for-dir.sh @@ -15,8 +15,8 @@ on: - "!tests/*.windows" pull_request: paths: - - "eclipse-temurin-22-jammy/**" - - .github/workflows/eclipse-temurin-22-jammy.yml + - "amazoncorretto-23-al2023/**" + - .github/workflows/amazoncorretto-23-al2023.yml - .github/workflows/_template.yml - common.sh - tags-for-dir.sh @@ -28,5 +28,5 @@ jobs: build: uses: ./.github/workflows/_template.yml with: - directory: eclipse-temurin-22-jammy + directory: amazoncorretto-23-al2023 secrets: inherit diff --git a/.github/workflows/eclipse-temurin-22-alpine.yml b/.github/workflows/amazoncorretto-23-debian.yml similarity index 63% rename from .github/workflows/eclipse-temurin-22-alpine.yml rename to .github/workflows/amazoncorretto-23-debian.yml index c891b461..cf76c5fa 100644 --- a/.github/workflows/eclipse-temurin-22-alpine.yml +++ b/.github/workflows/amazoncorretto-23-debian.yml @@ -1,12 +1,12 @@ -name: eclipse-temurin-22-alpine +name: amazoncorretto-23-debian on: push: branches: - main paths: - - "eclipse-temurin-22-alpine/**" - - .github/workflows/eclipse-temurin-22-alpine.yml + - "amazoncorretto-23-debian/**" + - .github/workflows/amazoncorretto-23-debian.yml - .github/workflows/_template.yml - common.sh - tags-for-dir.sh @@ -15,8 +15,8 @@ on: - "!tests/*.windows" pull_request: paths: - - "eclipse-temurin-22-alpine/**" - - .github/workflows/eclipse-temurin-22-alpine.yml + - "amazoncorretto-23-debian/**" + - .github/workflows/amazoncorretto-23-debian.yml - .github/workflows/_template.yml - common.sh - tags-for-dir.sh @@ -28,5 +28,5 @@ jobs: build: uses: ./.github/workflows/_template.yml with: - directory: eclipse-temurin-22-alpine + directory: amazoncorretto-23-debian secrets: inherit diff --git a/.github/workflows/eclipse-temurin-22.yml b/.github/workflows/amazoncorretto-23.yml similarity index 67% rename from .github/workflows/eclipse-temurin-22.yml rename to .github/workflows/amazoncorretto-23.yml index d5525c13..6e0232be 100644 --- a/.github/workflows/eclipse-temurin-22.yml +++ b/.github/workflows/amazoncorretto-23.yml @@ -1,12 +1,12 @@ -name: eclipse-temurin-22 +name: amazoncorretto-23 on: push: branches: - main paths: - - "eclipse-temurin-22/**" - - .github/workflows/eclipse-temurin-22.yml + - "amazoncorretto-23/**" + - .github/workflows/amazoncorretto-23.yml - .github/workflows/_template.yml - common.sh - tags-for-dir.sh @@ -15,8 +15,8 @@ on: - "!tests/*.windows" pull_request: paths: - - "eclipse-temurin-22/**" - - .github/workflows/eclipse-temurin-22.yml + - "amazoncorretto-23/**" + - .github/workflows/amazoncorretto-23.yml - .github/workflows/_template.yml - common.sh - tags-for-dir.sh @@ -28,5 +28,5 @@ jobs: build: uses: ./.github/workflows/_template.yml with: - directory: eclipse-temurin-22 + directory: amazoncorretto-23 secrets: inherit diff --git a/.github/workflows/azulzulu-23-alpine.yml b/.github/workflows/azulzulu-23-alpine.yml new file mode 100644 index 00000000..2e945e3e --- /dev/null +++ b/.github/workflows/azulzulu-23-alpine.yml @@ -0,0 +1,32 @@ +name: azulzulu-23-alpine + +on: + push: + branches: + - main + paths: + - "azulzulu-23-alpine/**" + - .github/workflows/azulzulu-23-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "azulzulu-23-alpine/**" + - .github/workflows/azulzulu-23-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: azulzulu-23-alpine + secrets: inherit diff --git a/.github/workflows/azulzulu-23-debian.yml b/.github/workflows/azulzulu-23-debian.yml new file mode 100644 index 00000000..ad15f2d1 --- /dev/null +++ b/.github/workflows/azulzulu-23-debian.yml @@ -0,0 +1,32 @@ +name: azulzulu-23-debian + +on: + push: + branches: + - main + paths: + - "azulzulu-23-debian/**" + - .github/workflows/azulzulu-23-debian.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "azulzulu-23-debian/**" + - .github/workflows/azulzulu-23-debian.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: azulzulu-23-debian + secrets: inherit diff --git a/.github/workflows/sapmachine-22.yml b/.github/workflows/azulzulu-23.yml similarity index 70% rename from .github/workflows/sapmachine-22.yml rename to .github/workflows/azulzulu-23.yml index aa19f936..6ae72ba7 100644 --- a/.github/workflows/sapmachine-22.yml +++ b/.github/workflows/azulzulu-23.yml @@ -1,12 +1,12 @@ -name: sapmachine-22 +name: azulzulu-23 on: push: branches: - main paths: - - "sapmachine-22/**" - - .github/workflows/sapmachine-22.yml + - "azulzulu-23/**" + - .github/workflows/azulzulu-23.yml - .github/workflows/_template.yml - common.sh - tags-for-dir.sh @@ -15,8 +15,8 @@ on: - "!tests/*.windows" pull_request: paths: - - "sapmachine-22/**" - - .github/workflows/sapmachine-22.yml + - "azulzulu-23/**" + - .github/workflows/azulzulu-23.yml - .github/workflows/_template.yml - common.sh - tags-for-dir.sh @@ -28,5 +28,5 @@ jobs: build: uses: ./.github/workflows/_template.yml with: - directory: sapmachine-22 + directory: azulzulu-23 secrets: inherit diff --git a/.github/workflows/eclipse-temurin-23-alpine.yml b/.github/workflows/eclipse-temurin-23-alpine.yml new file mode 100644 index 00000000..8a99868c --- /dev/null +++ b/.github/workflows/eclipse-temurin-23-alpine.yml @@ -0,0 +1,32 @@ +name: eclipse-temurin-23-alpine + +on: + push: + branches: + - main + paths: + - "eclipse-temurin-23-alpine/**" + - .github/workflows/eclipse-temurin-23-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "eclipse-temurin-23-alpine/**" + - .github/workflows/eclipse-temurin-23-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: eclipse-temurin-23-alpine + secrets: inherit diff --git a/.github/workflows/eclipse-temurin-23-noble.yml b/.github/workflows/eclipse-temurin-23-noble.yml new file mode 100644 index 00000000..0a36c302 --- /dev/null +++ b/.github/workflows/eclipse-temurin-23-noble.yml @@ -0,0 +1,32 @@ +name: eclipse-temurin-23-noble + +on: + push: + branches: + - main + paths: + - "eclipse-temurin-23-noble/**" + - .github/workflows/eclipse-temurin-23-noble.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "eclipse-temurin-23-noble/**" + - .github/workflows/eclipse-temurin-23-noble.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: eclipse-temurin-23-noble + secrets: inherit diff --git a/.github/workflows/eclipse-temurin-23.yml b/.github/workflows/eclipse-temurin-23.yml new file mode 100644 index 00000000..62b310f4 --- /dev/null +++ b/.github/workflows/eclipse-temurin-23.yml @@ -0,0 +1,32 @@ +name: eclipse-temurin-23 + +on: + push: + branches: + - main + paths: + - "eclipse-temurin-23/**" + - .github/workflows/eclipse-temurin-23.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "eclipse-temurin-23/**" + - .github/workflows/eclipse-temurin-23.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: eclipse-temurin-23 + secrets: inherit diff --git a/.github/workflows/graalvm-community-23.yml b/.github/workflows/graalvm-community-23.yml new file mode 100644 index 00000000..97b2d428 --- /dev/null +++ b/.github/workflows/graalvm-community-23.yml @@ -0,0 +1,32 @@ +name: graalvm-community-23 + +on: + push: + branches: + - main + paths: + - "graalvm-community-23/**" + - .github/workflows/graalvm-community-23.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "graalvm-community-23/**" + - .github/workflows/graalvm-community-23.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: graalvm-community-23 + secrets: inherit diff --git a/.github/workflows/ibm-semeru-23-jammy.yml b/.github/workflows/ibm-semeru-23-jammy.yml new file mode 100644 index 00000000..3c0b7387 --- /dev/null +++ b/.github/workflows/ibm-semeru-23-jammy.yml @@ -0,0 +1,32 @@ +name: ibm-semeru-23-jammy + +on: + push: + branches: + - main + paths: + - "ibm-semeru-23-jammy/**" + - .github/workflows/ibm-semeru-23-jammy.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "ibm-semeru-23-jammy/**" + - .github/workflows/ibm-semeru-23-jammy.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: ibm-semeru-23-jammy + secrets: inherit diff --git a/.github/workflows/oracle-graalvm-23.yml b/.github/workflows/oracle-graalvm-23.yml new file mode 100644 index 00000000..63f0eade --- /dev/null +++ b/.github/workflows/oracle-graalvm-23.yml @@ -0,0 +1,32 @@ +name: oracle-graalvm-23 + +on: + push: + branches: + - main + paths: + - "oracle-graalvm-23/**" + - .github/workflows/oracle-graalvm-23.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "oracle-graalvm-23/**" + - .github/workflows/oracle-graalvm-23.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: oracle-graalvm-23 + secrets: inherit diff --git a/.github/workflows/sapmachine-23.yml b/.github/workflows/sapmachine-23.yml new file mode 100644 index 00000000..8c27c5ef --- /dev/null +++ b/.github/workflows/sapmachine-23.yml @@ -0,0 +1,32 @@ +name: sapmachine-23 + +on: + push: + branches: + - main + paths: + - "sapmachine-23/**" + - .github/workflows/sapmachine-23.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "sapmachine-23/**" + - .github/workflows/sapmachine-23.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: sapmachine-23 + secrets: inherit diff --git a/README.md b/README.md index fcf45742..23da8c7e 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,6 @@ Images are published under: See Docker Hub or GitHub Container Registry for an updated list of tags -* ~~[openjdk-8](https://github.com/carlossg/docker-maven/blob/main/openjdk-8/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated) -* ~~[openjdk-8-slim](https://github.com/carlossg/docker-maven/blob/main/openjdk-8-slim/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated) -* ~~[openjdk-11](https://github.com/carlossg/docker-maven/blob/main/openjdk-11/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated) -* ~~[openjdk-11-slim](https://github.com/carlossg/docker-maven/blob/main/openjdk-11-slim/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated) -* ~~[openjdk-17](https://github.com/carlossg/docker-maven/blob/main/openjdk-17/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated) -* ~~[openjdk-17-slim](https://github.com/carlossg/docker-maven/blob/main/openjdk-17-slim/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated) -* ~~[openjdk-18](https://github.com/carlossg/docker-maven/blob/main/openjdk-17/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated) -* ~~[openjdk-18-slim](https://github.com/carlossg/docker-maven/blob/main/openjdk-17-slim/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated) * [eclipse-temurin-8](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-8/Dockerfile) * [eclipse-temurin-8-alpine](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-8-alpine/Dockerfile) * [eclipse-temurin-8-focal](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-8-focal/Dockerfile) @@ -33,12 +25,13 @@ See Docker Hub or GitHub Container Registry for an updated list of tags * [eclipse-temurin-21](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-21/Dockerfile) * [eclipse-temurin-21-alpine](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-21-alpine/Dockerfile) * [eclipse-temurin-21-jammy](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-21-jammy/Dockerfile) -* [eclipse-temurin-22](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-22/Dockerfile) -* [eclipse-temurin-22-alpine](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-22-alpine/Dockerfile) -* [eclipse-temurin-22-jammy](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-22-jammy/Dockerfile) +* [eclipse-temurin-23](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-23/Dockerfile) +* [eclipse-temurin-23-alpine](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-23-alpine/Dockerfile) +* [eclipse-temurin-23-noble](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-23-noble/Dockerfile) * [ibm-semeru-11-focal](https://github.com/carlossg/docker-maven/blob/main/ibm-semeru-11-focal/Dockerfile) * [ibm-semeru-17-focal](https://github.com/carlossg/docker-maven/blob/main/ibm-semeru-17-focal/Dockerfile) * [ibm-semeru-21-jammy](https://github.com/carlossg/docker-maven/blob/main/ibm-semeru-21-jammy/Dockerfile) +* [ibm-semeru-23-jammy](https://github.com/carlossg/docker-maven/blob/main/ibm-semeru-23-jammy/Dockerfile) * [ibmjava-8](https://github.com/carlossg/docker-maven/blob/main/ibmjava-8/Dockerfile) * [amazoncorretto-8](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-8/Dockerfile) * [amazoncorretto-8-al2023](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-8-al2023/Dockerfile) @@ -52,10 +45,13 @@ See Docker Hub or GitHub Container Registry for an updated list of tags * [amazoncorretto-21](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-21/) * [amazoncorretto-21-al2023](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-21-al2023/) * [amazoncorretto-21-debian](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-21-debian/Dockerfile) +* [amazoncorretto-23](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-23/) +* [amazoncorretto-23-al2023](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-23-al2023/) +* [amazoncorretto-23-debian](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-23-debian/Dockerfile) * [sapmachine-11](https://github.com/carlossg/docker-maven/blob/main/sapmachine-11/) * [sapmachine-17](https://github.com/carlossg/docker-maven/blob/main/sapmachine-17/) * [sapmachine-21](https://github.com/carlossg/docker-maven/blob/main/sapmachine-21/) -* [sapmachine-22](https://github.com/carlossg/docker-maven/blob/main/sapmachine-22/) +* [sapmachine-23](https://github.com/carlossg/docker-maven/blob/main/sapmachine-23/) Only under `csanchez/maven` and `ghcr.io/carlossg/maven`: * [azulzulu-8](https://github.com/carlossg/docker-maven/blob/main/azulzulu-8/Dockerfile) @@ -70,8 +66,12 @@ Only under `csanchez/maven` and `ghcr.io/carlossg/maven`: * [azulzulu-21](https://github.com/carlossg/docker-maven/blob/main/azulzulu-21/Dockerfile) * [azulzulu-21-alpine](https://github.com/carlossg/docker-maven/blob/main/azulzulu-21-alpine/Dockerfile) * [azulzulu-21-debian](https://github.com/carlossg/docker-maven/blob/main/azulzulu-21-debian/Dockerfile) +* [azulzulu-23](https://github.com/carlossg/docker-maven/blob/main/azulzulu-23/Dockerfile) +* [azulzulu-23-alpine](https://github.com/carlossg/docker-maven/blob/main/azulzulu-23-alpine/Dockerfile) +* [azulzulu-23-debian](https://github.com/carlossg/docker-maven/blob/main/azulzulu-23-debian/Dockerfile) * [graalvm-community-17](https://github.com/carlossg/docker-maven/blob/main/graalvm-community-17/) * [graalvm-community-21](https://github.com/carlossg/docker-maven/blob/main/graalvm-community-21/) +* [graalvm-community-23](https://github.com/carlossg/docker-maven/blob/main/graalvm-community-23/) * [libericaopenjdk-8-alpine](https://github.com/carlossg/docker-maven/blob/main/libericaopenjdk-8-alpine/Dockerfile) * [libericaopenjdk-8-debian](https://github.com/carlossg/docker-maven/blob/main/libericaopenjdk-8-debian/Dockerfile) * [libericaopenjdk-11-alpine](https://github.com/carlossg/docker-maven/blob/main/libericaopenjdk-11-alpine/Dockerfile) @@ -83,6 +83,7 @@ Only under `csanchez/maven` and `ghcr.io/carlossg/maven`: * [microsoft-openjdk-21-ubuntu](https://github.com/carlossg/docker-maven/blob/main/microsoft-openjdk-21-ubuntu/Dockerfile) * [oracle-graalvm-17](https://github.com/carlossg/docker-maven/blob/main/oracle-graalvm-17/) * [oracle-graalvm-21](https://github.com/carlossg/docker-maven/blob/main/oracle-graalvm-21/) +* [oracle-graalvm-23](https://github.com/carlossg/docker-maven/blob/main/oracle-graalvm-23/) ## Windows Based Images @@ -229,6 +230,9 @@ Some come from the parent images and some are installed in this image for backwa | amazoncorretto-21 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | | amazoncorretto-21-al2023 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | | amazoncorretto-21-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | +| amazoncorretto-23 | | ✔︎ | | ✔︎ | | ✔︎ | | ✔︎ | ✔︎ | +| amazoncorretto-23-al2023 | | ✔︎ | | ✔︎ | | ✔︎ | | ✔︎ | ✔︎ | +| amazoncorretto-23-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | azulzulu-8 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | azulzulu-8-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | azulzulu-8-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | @@ -241,6 +245,9 @@ Some come from the parent images and some are installed in this image for backwa | azulzulu-21 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | azulzulu-21-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | azulzulu-21-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | +| azulzulu-23 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| azulzulu-23-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| azulzulu-23-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | eclipse-temurin-8 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | eclipse-temurin-8-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | eclipse-temurin-8-focal | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | @@ -252,15 +259,17 @@ Some come from the parent images and some are installed in this image for backwa | eclipse-temurin-17-focal | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | eclipse-temurin-21 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | eclipse-temurin-21-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | -| eclipse-temurin-22-jammy | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | -| eclipse-temurin-22 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | -| eclipse-temurin-22-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | -| eclipse-temurin-22-jammy | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| eclipse-temurin-21-jammy | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| eclipse-temurin-23 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| eclipse-temurin-23-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| eclipse-temurin-23-noble | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | graalvm-community-17 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | | graalvm-community-21 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | +| graalvm-community-23 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | | ibm-semeru-11-focal | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | ibm-semeru-17-focal | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | ibm-semeru-21-jammy | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| ibm-semeru-23-jammy | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | ibmjava-8 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | libericaopenjdk-8-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | libericaopenjdk-8-debian | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | @@ -273,10 +282,11 @@ Some come from the parent images and some are installed in this image for backwa | microsoft-openjdk-21-ubuntu | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | oracle-graalvm-17 | | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | ✔︎ | ✔︎ | | oracle-graalvm-21 | | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | ✔︎ | ✔︎ | +| oracle-graalvm-23 | | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | ✔︎ | ✔︎ | | sapmachine-11 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | sapmachine-17 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | sapmachine-21 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | -| sapmachine-22 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| sapmachine-23 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | # Image Verification diff --git a/amazoncorretto-23-al2023/Dockerfile b/amazoncorretto-23-al2023/Dockerfile new file mode 100644 index 00000000..1c970cc7 --- /dev/null +++ b/amazoncorretto-23-al2023/Dockerfile @@ -0,0 +1,24 @@ +FROM amazoncorretto:23-al2023 + +RUN yum install -y openssh-clients + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/amazoncorretto-23-debian/Dockerfile b/amazoncorretto-23-debian/Dockerfile new file mode 100644 index 00000000..88fa8237 --- /dev/null +++ b/amazoncorretto-23-debian/Dockerfile @@ -0,0 +1,41 @@ +# Update EXTRA_TAG_SUFFIXES to new release when changing to next stable debian release +# EXTRA_TAG_SUFFIXES=bookworm +FROM debian:bookworm-slim + +# install corretto after verifying that the key is the one we expect. +# and keep openssh client +RUN apt-get update \ + && apt-get install -y curl gnupg openssh-client \ + && export GNUPGHOME="$(mktemp -d)" \ + && curl -fL https://apt.corretto.aws/corretto.key | gpg --batch --import \ + && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \ + && unset GNUPGHOME \ + && echo "deb [signed-by=/usr/share/keyrings/corretto.gpg] https://apt.corretto.aws stable main" > /etc/apt/sources.list.d/corretto.list \ + && apt-get update \ + && apt-get remove --purge --autoremove -y curl gnupg \ + && apt-get install -y java-23-amazon-corretto-jdk \ + && rm -rf /var/lib/apt/lists/* + +# set JAVA_HOME manually since nothing else will set it +ENV JAVA_HOME="/usr/lib/jvm/java-23-amazon-corretto" + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/amazoncorretto-23/Dockerfile b/amazoncorretto-23/Dockerfile new file mode 100644 index 00000000..eb45ea1a --- /dev/null +++ b/amazoncorretto-23/Dockerfile @@ -0,0 +1,24 @@ +FROM amazoncorretto:23 + +RUN yum install -y openssh-clients findutils + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/eclipse-temurin-22-alpine/Dockerfile b/azulzulu-23-alpine/Dockerfile similarity index 96% rename from eclipse-temurin-22-alpine/Dockerfile rename to azulzulu-23-alpine/Dockerfile index 93dadf1c..ceb1c6aa 100644 --- a/eclipse-temurin-22-alpine/Dockerfile +++ b/azulzulu-23-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:22-jdk-alpine +FROM azul/zulu-openjdk-alpine:23 RUN apk add --no-cache bash procps curl tar openssh-client diff --git a/azulzulu-23-debian/Dockerfile b/azulzulu-23-debian/Dockerfile new file mode 100644 index 00000000..c013c180 --- /dev/null +++ b/azulzulu-23-debian/Dockerfile @@ -0,0 +1,26 @@ +FROM azul/zulu-openjdk-debian:23 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends openssh-client \ + && rm -rf /var/lib/apt/lists/* + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/azulzulu-23/Dockerfile b/azulzulu-23/Dockerfile new file mode 100644 index 00000000..d42c8a73 --- /dev/null +++ b/azulzulu-23/Dockerfile @@ -0,0 +1,26 @@ +FROM azul/zulu-openjdk:23 + +RUN apt-get update \ + && apt-get install -y ca-certificates curl openssh-client --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/eclipse-temurin-23-alpine/Dockerfile b/eclipse-temurin-23-alpine/Dockerfile new file mode 100644 index 00000000..f86585ad --- /dev/null +++ b/eclipse-temurin-23-alpine/Dockerfile @@ -0,0 +1,24 @@ +FROM eclipse-temurin:23-jdk-alpine + +RUN apk add --no-cache bash procps curl tar openssh-client + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/eclipse-temurin-22-jammy/Dockerfile b/eclipse-temurin-23-noble/Dockerfile similarity index 97% rename from eclipse-temurin-22-jammy/Dockerfile rename to eclipse-temurin-23-noble/Dockerfile index c70134ae..9f0c4bfd 100644 --- a/eclipse-temurin-22-jammy/Dockerfile +++ b/eclipse-temurin-23-noble/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:22-jdk-jammy +FROM eclipse-temurin:23-jdk-noble RUN apt-get update \ && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \ diff --git a/eclipse-temurin-22/Dockerfile b/eclipse-temurin-23/Dockerfile similarity index 97% rename from eclipse-temurin-22/Dockerfile rename to eclipse-temurin-23/Dockerfile index aa148052..575ce94a 100644 --- a/eclipse-temurin-22/Dockerfile +++ b/eclipse-temurin-23/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:22-jdk +FROM eclipse-temurin:23-jdk RUN apt-get update \ && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \ diff --git a/graalvm-community-23/Dockerfile b/graalvm-community-23/Dockerfile new file mode 100644 index 00000000..f8828bbe --- /dev/null +++ b/graalvm-community-23/Dockerfile @@ -0,0 +1,24 @@ +FROM ghcr.io/graalvm/graalvm-community:23 + +RUN microdnf --refresh -y install findutils openssh-clients + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/ibm-semeru-23-jammy/Dockerfile b/ibm-semeru-23-jammy/Dockerfile new file mode 100644 index 00000000..2a3e946c --- /dev/null +++ b/ibm-semeru-23-jammy/Dockerfile @@ -0,0 +1,26 @@ +FROM ibm-semeru-runtimes:open-23-jdk-jammy + +RUN apt-get update \ + && apt-get install -y git openssh-client --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/jdk-new-version.sh b/jdk-new-version.sh new file mode 100755 index 00000000..3ea1207d --- /dev/null +++ b/jdk-new-version.sh @@ -0,0 +1,16 @@ +#!/bin/bash -eu + +# Create a new image of each JDK with the new version number + +# gnu sed +PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH" + +from_version="21" +to_version="23" +find . -type d -iname "*${from_version}*" -maxdepth 1 | while read -r dir; do + dir=${dir#./} + new_dir="${dir/${from_version}/${to_version}}" + echo "${dir} -> ${new_dir}" + cp -a "$dir" "${new_dir}" + sed -i "s/${from_version}/${to_version}/g" "${new_dir}/Dockerfile" +done diff --git a/oracle-graalvm-23/Dockerfile b/oracle-graalvm-23/Dockerfile new file mode 100644 index 00000000..8332f8d3 --- /dev/null +++ b/oracle-graalvm-23/Dockerfile @@ -0,0 +1,24 @@ +FROM container-registry.oracle.com/graalvm/native-image:23 + +RUN microdnf --refresh -y install findutils openssh-clients + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/sapmachine-22/Dockerfile b/sapmachine-23/Dockerfile similarity index 98% rename from sapmachine-22/Dockerfile rename to sapmachine-23/Dockerfile index 5a1f7db5..9904ed17 100644 --- a/sapmachine-22/Dockerfile +++ b/sapmachine-23/Dockerfile @@ -1,4 +1,4 @@ -FROM sapmachine:22 +FROM sapmachine:23 RUN apt-get update \ && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \ diff --git a/tests/tests.bats b/tests/tests.bats index dcf3a52c..8db39735 100644 --- a/tests/tests.bats +++ b/tests/tests.bats @@ -105,8 +105,15 @@ base_image=eclipse-temurin-17 } @test "$SUT_TAG tar is installed" { - run docker run --rm $SUT_IMAGE:$SUT_TAG tar --version - assert_success + if ! ( + [[ "$SUT_TAG" == "amazoncorretto-23" ]] || + [[ "$SUT_TAG" == "amazoncorretto-23-al2023" ]] + ); then + run docker run --rm $SUT_IMAGE:$SUT_TAG tar --version + assert_success + else + run -127 docker run --rm $SUT_IMAGE:$SUT_TAG tar --version + fi } @test "$SUT_TAG bash is installed" { @@ -117,7 +124,9 @@ base_image=eclipse-temurin-17 @test "$SUT_TAG which is installed" { if ! ( [[ "$SUT_TAG" == openjdk-?? ]] || - [[ "$SUT_TAG" == *"oracle"* ]] + [[ "$SUT_TAG" == *"oracle"* ]] || + [[ "$SUT_TAG" == "amazoncorretto-23" ]] || + [[ "$SUT_TAG" == "amazoncorretto-23-al2023" ]] ); then run docker run --rm $SUT_IMAGE:$SUT_TAG which sh [ $status -eq 0 ]