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

chore: eclipse-temurin alpine now includes gpg #513

Merged
merged 3 commits into from
Oct 25, 2024
Merged

chore: eclipse-temurin alpine now includes gpg #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a64a97
chore: eclipse-temurin now includes gpg
carlossg Oct 24, 2024
482c80c
chore: bump windows jdks
carlossg Oct 24, 2024
7f16028
feat: drop openjdk windows images
carlossg Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions .github/workflows/openjdk-11-nanoserver.yml
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/openjdk-11-windowsservercore.yml
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/openjdk-8-nanoserver.yml
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/openjdk-8-windowsservercore.yml
View file
Open in desktop

This file was deleted.

34 changes: 15 additions & 19 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@ Only under `csanchez/maven` and `ghcr.io/carlossg/maven`:

See Docker Hub [`csanchez/maven`](https://hub.docker.com/r/csanchez/maven) for an updated list of tags

* ~~[openjdk-8-windowsservercore-1809](https://github.com/carlossg/docker-maven/blob/main/openjdk-8-windowsservercore/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated)
* ~~[openjdk-8-nanoserver](https://github.com/carlossg/docker-maven/blob/main/openjdk-8-nanoserver/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated)
* ~~[openjdk-11-windowsservercore-1809](https://github.com/carlossg/docker-maven/blob/main/openjdk-11-windowsservercore/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated)
* ~~[openjdk-11-nanoserver](https://github.com/carlossg/docker-maven/blob/main/openjdk-11-nanoserver/Dockerfile)~~ [(deprecated)](https://github.com/docker-library/openjdk?tab=readme-ov-file#deprecated)
* [amazoncorretto-8-windowsservercore-1809](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-8-windowsservercore/Dockerfile)
* [amazoncorretto-11-windowsservercore-1809](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-11-windowsservercore/Dockerfile)
* [amazoncorretto-17-windowsservercore-1809](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-17-windowsservercore/Dockerfile)
Expand Down Expand Up @@ -258,21 +254,21 @@ Some come from the parent images and some are installed in this image for backwa
| azulzulu-23 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| azulzulu-23-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| azulzulu-23-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ |
| eclipse-temurin-8 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-8-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-8-focal | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-11 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-11-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-11-focal | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-17 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-17-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-17-focal | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-21 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-21-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-21-jammy | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-23 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-23-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-23-noble | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ |
| eclipse-temurin-8 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-8-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-8-focal | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-11 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-11-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-11-focal | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-17 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-17-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-17-focal | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-21 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-21-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-21-jammy | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-23 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-23-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| eclipse-temurin-23-noble | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ |
| graalvm-community-17 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ |
| graalvm-community-21 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ |
| graalvm-community-23 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ |
Expand Down
4 changes: 2 additions & 2 deletions amazoncorretto-11-windowsservercore/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref

ARG zip=amazon-corretto-11-x64-windows-jdk.zip
ARG uri=https://corretto.aws/downloads/latest
ARG hash=26f3d4ffcd3c59f9e5f620d9c99dd66c54c89e02f0df1153f243e9597243eade
ARG hash=98bef58c1d8579f0a0043cd7aeb1eb7bb0af43d71e76f977e35be1c59a6fa9c1

RUN Invoke-WebRequest -Uri $('{0}/{1}' -f $env:uri,$env:zip) -OutFile C:/$env:zip ; `
if((Get-FileHash C:/$env:zip -Algorithm SHA256).Hash.ToLower() -ne $env:hash) { exit 1 } ; `
Expand-Archive -Path C:/$env:zip -Destination C:/ProgramData ; `
Remove-Item C:/${env:zip}

ENV JAVA_HOME=C:/ProgramData/jdk11.0.24_8
ENV JAVA_HOME=C:/ProgramData/jdk11.0.25_9

ARG USER_HOME_DIR="C:/Users/ContainerUser"
ARG MAVEN_VERSION=3.9.9
Expand Down
4 changes: 2 additions & 2 deletions amazoncorretto-17-windowsservercore/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref

ARG zip=amazon-corretto-17-x64-windows-jdk.zip
ARG uri=https://corretto.aws/downloads/latest
ARG hash=df6cb295eb17ba7e898f99657da977bb96389c5e97de94f3a06053650d7c4e16
ARG hash=eaacdc37c6f23753ebfae341985f11baacfaf84ca972e600803cb409c94ee8ca

RUN Invoke-WebRequest -Uri $('{0}/{1}' -f $env:uri,$env:zip) -OutFile C:/$env:zip ; `
if((Get-FileHash C:/$env:zip -Algorithm SHA256).Hash.ToLower() -ne $env:hash) { exit 1 } ; `
Expand-Archive -Path C:/$env:zip -Destination C:/ProgramData ; `
Remove-Item C:/${env:zip}

ENV JAVA_HOME=C:/ProgramData/jdk17.0.12_7
ENV JAVA_HOME=C:/ProgramData/jdk17.0.13_11

ARG USER_HOME_DIR="C:/Users/ContainerUser"
ARG MAVEN_VERSION=3.9.9
Expand Down
4 changes: 2 additions & 2 deletions amazoncorretto-8-windowsservercore/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref

ARG zip=amazon-corretto-8-x64-windows-jdk.zip
ARG uri=https://corretto.aws/downloads/latest
ARG hash=cdeeb2653927d8fcb0b031e06114775018777d9b97ddf53c7e249711b94be0d8
ARG hash=f67fddbc7b0d2da6b9fb1a1b635bef4122c9030b11a1985745c279821486548b

RUN Invoke-WebRequest -Uri $('{0}/{1}' -f $env:uri,$env:zip) -OutFile C:/$env:zip ; `
if((Get-FileHash C:/$env:zip -Algorithm SHA256).Hash.ToLower() -ne $env:hash) { exit 1 } ; `
Expand-Archive -Path C:/$env:zip -Destination C:/ProgramData ; `
Remove-Item C:/${env:zip}

ENV JAVA_HOME=C:/ProgramData/jdk1.8.0_422
ENV JAVA_HOME=C:/ProgramData/jdk1.8.0_432

ARG USER_HOME_DIR="C:/Users/ContainerUser"
ARG MAVEN_VERSION=3.9.9
Expand Down
5 changes: 2 additions & 3 deletions common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ latest='21'
default_jdk=eclipse-temurin

# All the JDKs and their 'latest' tags
parent_images=(openjdk eclipse-temurin ibmjava ibm-semeru amazoncorretto libericaopenjdk sapmachine graalvm-community oracle-graalvm)
parent_images=(eclipse-temurin ibmjava ibm-semeru amazoncorretto libericaopenjdk sapmachine graalvm-community oracle-graalvm)
declare -A jdk_latest=(
["jdk"]="17"
["openjdk"]=""
["eclipse-temurin"]=$latest
["ibmjava"]="8"
["ibm-semeru"]=""
Expand All @@ -31,7 +30,7 @@ declare -A extra_tags=(
)

# All the directories that have images
all_dirs=(openjdk-* eclipse-temurin-* ibmjava-* ibm-semeru-* amazoncorretto-* azulzulu-* libericaopenjdk-* microsoft-* sapmachine-* graalvm-community-* oracle-graalvm-*)
all_dirs=(eclipse-temurin-* ibmjava-* ibm-semeru-* amazoncorretto-* azulzulu-* libericaopenjdk-* microsoft-* sapmachine-* graalvm-community-* oracle-graalvm-*)

######################################################################################################################################

Expand Down
2 changes: 1 addition & 1 deletion github-action.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Write-Host "Image: $dir"
if(($dir.Contains('amazoncorretto')) -or ($dir.Contains('azulzulu'))) {
$windowsDockerTag = 'ltsc2019'
}
if(($dir.Contains('eclipse-temurin')) -or ($dir.Contains('openjdk'))) {
if($dir.Contains('eclipse-temurin')) {
$windowsDockerTag = '1809'
}

Expand Down
49 changes: 0 additions & 49 deletions openjdk-11-nanoserver/Dockerfile
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions openjdk-11-nanoserver/mvn-entrypoint.ps1
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions openjdk-11-nanoserver/settings-docker.xml
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions openjdk-11-windowsservercore/Dockerfile
View file
Open in desktop

This file was deleted.

Loading
Loading