Last active
August 22, 2024 21:00
-
-
Save gdams/de1eec781fc16585276553c7685ff6c8 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/_bashbrew-arches b/_bashbrew-arches | |
| index 16dde84..64ef76e 100644 | |
| --- a/_bashbrew-arches | |
| +++ b/_bashbrew-arches | |
| @@ -2,5 +2,6 @@ amd64 | |
| arm32v7 | |
| arm64v8 | |
| ppc64le | |
| +riscv64 | |
| s390x | |
| windows-amd64 | |
| diff --git a/_bashbrew-cat b/_bashbrew-cat | |
| index e2d78ac..494cff5 100644 | |
| --- a/_bashbrew-cat | |
| +++ b/_bashbrew-cat | |
| @@ -4,23 +4,23 @@ GitFetch: refs/heads/main | |
| Builder: buildkit | |
| Tags: 8u422-b05-jdk-alpine, 8-jdk-alpine, 8-alpine | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jdk/alpine | |
| Tags: 8u422-b05-jdk-focal, 8-jdk-focal, 8-focal | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jdk/ubuntu/focal | |
| Tags: 8u422-b05-jdk-jammy, 8-jdk-jammy, 8-jammy | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jdk/ubuntu/jammy | |
| Tags: 8u422-b05-jdk-nanoserver-1809, 8-jdk-nanoserver-1809, 8-nanoserver-1809 | |
| SharedTags: 8u422-b05-jdk-nanoserver, 8-jdk-nanoserver, 8-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jdk/windows/nanoserver-1809 | |
| Builder: classic | |
| Constraints: nanoserver-1809, windowsservercore-1809 | |
| @@ -28,7 +28,7 @@ Constraints: nanoserver-1809, windowsservercore-1809 | |
| Tags: 8u422-b05-jdk-nanoserver-ltsc2022, 8-jdk-nanoserver-ltsc2022, 8-nanoserver-ltsc2022 | |
| SharedTags: 8u422-b05-jdk-nanoserver, 8-jdk-nanoserver, 8-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jdk/windows/nanoserver-ltsc2022 | |
| Builder: classic | |
| Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| @@ -36,18 +36,18 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| Tags: 8u422-b05-jdk-noble, 8-jdk-noble, 8-noble | |
| SharedTags: 8u422-b05-jdk, 8-jdk, 8 | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jdk/ubuntu/noble | |
| Tags: 8u422-b05-jdk-ubi9-minimal, 8-jdk-ubi9-minimal, 8-ubi9-minimal | |
| Architectures: amd64, arm64v8, ppc64le | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jdk/ubi/ubi9-minimal | |
| Tags: 8u422-b05-jdk-windowsservercore-1809, 8-jdk-windowsservercore-1809, 8-windowsservercore-1809 | |
| SharedTags: 8u422-b05-jdk-windowsservercore, 8-jdk-windowsservercore, 8-windowsservercore, 8u422-b05-jdk, 8-jdk, 8 | |
| Architectures: windows-amd64 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jdk/windows/windowsservercore-1809 | |
| Builder: classic | |
| Constraints: windowsservercore-1809 | |
| @@ -55,29 +55,29 @@ Constraints: windowsservercore-1809 | |
| Tags: 8u422-b05-jdk-windowsservercore-ltsc2022, 8-jdk-windowsservercore-ltsc2022, 8-windowsservercore-ltsc2022 | |
| SharedTags: 8u422-b05-jdk-windowsservercore, 8-jdk-windowsservercore, 8-windowsservercore, 8u422-b05-jdk, 8-jdk, 8 | |
| Architectures: windows-amd64 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jdk/windows/windowsservercore-ltsc2022 | |
| Builder: classic | |
| Constraints: windowsservercore-ltsc2022 | |
| Tags: 8u422-b05-jre-alpine, 8-jre-alpine | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jre/alpine | |
| Tags: 8u422-b05-jre-focal, 8-jre-focal | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jre/ubuntu/focal | |
| Tags: 8u422-b05-jre-jammy, 8-jre-jammy | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jre/ubuntu/jammy | |
| Tags: 8u422-b05-jre-nanoserver-1809, 8-jre-nanoserver-1809 | |
| SharedTags: 8u422-b05-jre-nanoserver, 8-jre-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jre/windows/nanoserver-1809 | |
| Builder: classic | |
| Constraints: nanoserver-1809, windowsservercore-1809 | |
| @@ -85,7 +85,7 @@ Constraints: nanoserver-1809, windowsservercore-1809 | |
| Tags: 8u422-b05-jre-nanoserver-ltsc2022, 8-jre-nanoserver-ltsc2022 | |
| SharedTags: 8u422-b05-jre-nanoserver, 8-jre-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jre/windows/nanoserver-ltsc2022 | |
| Builder: classic | |
| Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| @@ -93,18 +93,18 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| Tags: 8u422-b05-jre-noble, 8-jre-noble | |
| SharedTags: 8u422-b05-jre, 8-jre | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jre/ubuntu/noble | |
| Tags: 8u422-b05-jre-ubi9-minimal, 8-jre-ubi9-minimal | |
| Architectures: amd64, arm64v8, ppc64le | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jre/ubi/ubi9-minimal | |
| Tags: 8u422-b05-jre-windowsservercore-1809, 8-jre-windowsservercore-1809 | |
| SharedTags: 8u422-b05-jre-windowsservercore, 8-jre-windowsservercore, 8u422-b05-jre, 8-jre | |
| Architectures: windows-amd64 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jre/windows/windowsservercore-1809 | |
| Builder: classic | |
| Constraints: windowsservercore-1809 | |
| @@ -112,29 +112,29 @@ Constraints: windowsservercore-1809 | |
| Tags: 8u422-b05-jre-windowsservercore-ltsc2022, 8-jre-windowsservercore-ltsc2022 | |
| SharedTags: 8u422-b05-jre-windowsservercore, 8-jre-windowsservercore, 8u422-b05-jre, 8-jre | |
| Architectures: windows-amd64 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 8/jre/windows/windowsservercore-ltsc2022 | |
| Builder: classic | |
| Constraints: windowsservercore-ltsc2022 | |
| Tags: 11.0.24_8-jdk-alpine, 11-jdk-alpine, 11-alpine | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jdk/alpine | |
| Tags: 11.0.24_8-jdk-focal, 11-jdk-focal, 11-focal | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jdk/ubuntu/focal | |
| Tags: 11.0.24_8-jdk-jammy, 11-jdk-jammy, 11-jammy | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jdk/ubuntu/jammy | |
| Tags: 11.0.24_8-jdk-nanoserver-1809, 11-jdk-nanoserver-1809, 11-nanoserver-1809 | |
| SharedTags: 11.0.24_8-jdk-nanoserver, 11-jdk-nanoserver, 11-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jdk/windows/nanoserver-1809 | |
| Builder: classic | |
| Constraints: nanoserver-1809, windowsservercore-1809 | |
| @@ -142,7 +142,7 @@ Constraints: nanoserver-1809, windowsservercore-1809 | |
| Tags: 11.0.24_8-jdk-nanoserver-ltsc2022, 11-jdk-nanoserver-ltsc2022, 11-nanoserver-ltsc2022 | |
| SharedTags: 11.0.24_8-jdk-nanoserver, 11-jdk-nanoserver, 11-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jdk/windows/nanoserver-ltsc2022 | |
| Builder: classic | |
| Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| @@ -150,18 +150,18 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| Tags: 11.0.24_8-jdk-noble, 11-jdk-noble, 11-noble | |
| SharedTags: 11.0.24_8-jdk, 11-jdk, 11 | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jdk/ubuntu/noble | |
| Tags: 11.0.24_8-jdk-ubi9-minimal, 11-jdk-ubi9-minimal, 11-ubi9-minimal | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jdk/ubi/ubi9-minimal | |
| Tags: 11.0.24_8-jdk-windowsservercore-1809, 11-jdk-windowsservercore-1809, 11-windowsservercore-1809 | |
| SharedTags: 11.0.24_8-jdk-windowsservercore, 11-jdk-windowsservercore, 11-windowsservercore, 11.0.24_8-jdk, 11-jdk, 11 | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jdk/windows/windowsservercore-1809 | |
| Builder: classic | |
| Constraints: windowsservercore-1809 | |
| @@ -169,29 +169,29 @@ Constraints: windowsservercore-1809 | |
| Tags: 11.0.24_8-jdk-windowsservercore-ltsc2022, 11-jdk-windowsservercore-ltsc2022, 11-windowsservercore-ltsc2022 | |
| SharedTags: 11.0.24_8-jdk-windowsservercore, 11-jdk-windowsservercore, 11-windowsservercore, 11.0.24_8-jdk, 11-jdk, 11 | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jdk/windows/windowsservercore-ltsc2022 | |
| Builder: classic | |
| Constraints: windowsservercore-ltsc2022 | |
| Tags: 11.0.24_8-jre-alpine, 11-jre-alpine | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jre/alpine | |
| Tags: 11.0.24_8-jre-focal, 11-jre-focal | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jre/ubuntu/focal | |
| Tags: 11.0.24_8-jre-jammy, 11-jre-jammy | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jre/ubuntu/jammy | |
| Tags: 11.0.24_8-jre-nanoserver-1809, 11-jre-nanoserver-1809 | |
| SharedTags: 11.0.24_8-jre-nanoserver, 11-jre-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jre/windows/nanoserver-1809 | |
| Builder: classic | |
| Constraints: nanoserver-1809, windowsservercore-1809 | |
| @@ -199,7 +199,7 @@ Constraints: nanoserver-1809, windowsservercore-1809 | |
| Tags: 11.0.24_8-jre-nanoserver-ltsc2022, 11-jre-nanoserver-ltsc2022 | |
| SharedTags: 11.0.24_8-jre-nanoserver, 11-jre-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jre/windows/nanoserver-ltsc2022 | |
| Builder: classic | |
| Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| @@ -207,18 +207,18 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| Tags: 11.0.24_8-jre-noble, 11-jre-noble | |
| SharedTags: 11.0.24_8-jre, 11-jre | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jre/ubuntu/noble | |
| Tags: 11.0.24_8-jre-ubi9-minimal, 11-jre-ubi9-minimal | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jre/ubi/ubi9-minimal | |
| Tags: 11.0.24_8-jre-windowsservercore-1809, 11-jre-windowsservercore-1809 | |
| SharedTags: 11.0.24_8-jre-windowsservercore, 11-jre-windowsservercore, 11.0.24_8-jre, 11-jre | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jre/windows/windowsservercore-1809 | |
| Builder: classic | |
| Constraints: windowsservercore-1809 | |
| @@ -226,29 +226,29 @@ Constraints: windowsservercore-1809 | |
| Tags: 11.0.24_8-jre-windowsservercore-ltsc2022, 11-jre-windowsservercore-ltsc2022 | |
| SharedTags: 11.0.24_8-jre-windowsservercore, 11-jre-windowsservercore, 11.0.24_8-jre, 11-jre | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 11/jre/windows/windowsservercore-ltsc2022 | |
| Builder: classic | |
| Constraints: windowsservercore-ltsc2022 | |
| Tags: 17.0.12_7-jdk-alpine, 17-jdk-alpine, 17-alpine | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jdk/alpine | |
| Tags: 17.0.12_7-jdk-focal, 17-jdk-focal, 17-focal | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jdk/ubuntu/focal | |
| Tags: 17.0.12_7-jdk-jammy, 17-jdk-jammy, 17-jammy | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jdk/ubuntu/jammy | |
| Tags: 17.0.12_7-jdk-nanoserver-1809, 17-jdk-nanoserver-1809, 17-nanoserver-1809 | |
| SharedTags: 17.0.12_7-jdk-nanoserver, 17-jdk-nanoserver, 17-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: f7ce125dc28d8c0d065d94829e63094daa018ca3 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jdk/windows/nanoserver-1809 | |
| Builder: classic | |
| Constraints: nanoserver-1809, windowsservercore-1809 | |
| @@ -256,26 +256,26 @@ Constraints: nanoserver-1809, windowsservercore-1809 | |
| Tags: 17.0.12_7-jdk-nanoserver-ltsc2022, 17-jdk-nanoserver-ltsc2022, 17-nanoserver-ltsc2022 | |
| SharedTags: 17.0.12_7-jdk-nanoserver, 17-jdk-nanoserver, 17-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: f7ce125dc28d8c0d065d94829e63094daa018ca3 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jdk/windows/nanoserver-ltsc2022 | |
| Builder: classic | |
| Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| Tags: 17.0.12_7-jdk-noble, 17-jdk-noble, 17-noble | |
| SharedTags: 17.0.12_7-jdk, 17-jdk, 17 | |
| -Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jdk/ubuntu/noble | |
| Tags: 17.0.12_7-jdk-ubi9-minimal, 17-jdk-ubi9-minimal, 17-ubi9-minimal | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jdk/ubi/ubi9-minimal | |
| Tags: 17.0.12_7-jdk-windowsservercore-1809, 17-jdk-windowsservercore-1809, 17-windowsservercore-1809 | |
| SharedTags: 17.0.12_7-jdk-windowsservercore, 17-jdk-windowsservercore, 17-windowsservercore, 17.0.12_7-jdk, 17-jdk, 17 | |
| Architectures: windows-amd64 | |
| -GitCommit: f7ce125dc28d8c0d065d94829e63094daa018ca3 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jdk/windows/windowsservercore-1809 | |
| Builder: classic | |
| Constraints: windowsservercore-1809 | |
| @@ -283,29 +283,29 @@ Constraints: windowsservercore-1809 | |
| Tags: 17.0.12_7-jdk-windowsservercore-ltsc2022, 17-jdk-windowsservercore-ltsc2022, 17-windowsservercore-ltsc2022 | |
| SharedTags: 17.0.12_7-jdk-windowsservercore, 17-jdk-windowsservercore, 17-windowsservercore, 17.0.12_7-jdk, 17-jdk, 17 | |
| Architectures: windows-amd64 | |
| -GitCommit: f7ce125dc28d8c0d065d94829e63094daa018ca3 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jdk/windows/windowsservercore-ltsc2022 | |
| Builder: classic | |
| Constraints: windowsservercore-ltsc2022 | |
| Tags: 17.0.12_7-jre-alpine, 17-jre-alpine | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jre/alpine | |
| Tags: 17.0.12_7-jre-focal, 17-jre-focal | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jre/ubuntu/focal | |
| Tags: 17.0.12_7-jre-jammy, 17-jre-jammy | |
| Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jre/ubuntu/jammy | |
| Tags: 17.0.12_7-jre-nanoserver-1809, 17-jre-nanoserver-1809 | |
| SharedTags: 17.0.12_7-jre-nanoserver, 17-jre-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: f7ce125dc28d8c0d065d94829e63094daa018ca3 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jre/windows/nanoserver-1809 | |
| Builder: classic | |
| Constraints: nanoserver-1809, windowsservercore-1809 | |
| @@ -313,26 +313,26 @@ Constraints: nanoserver-1809, windowsservercore-1809 | |
| Tags: 17.0.12_7-jre-nanoserver-ltsc2022, 17-jre-nanoserver-ltsc2022 | |
| SharedTags: 17.0.12_7-jre-nanoserver, 17-jre-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: f7ce125dc28d8c0d065d94829e63094daa018ca3 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jre/windows/nanoserver-ltsc2022 | |
| Builder: classic | |
| Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| Tags: 17.0.12_7-jre-noble, 17-jre-noble | |
| SharedTags: 17.0.12_7-jre, 17-jre | |
| -Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jre/ubuntu/noble | |
| Tags: 17.0.12_7-jre-ubi9-minimal, 17-jre-ubi9-minimal | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jre/ubi/ubi9-minimal | |
| Tags: 17.0.12_7-jre-windowsservercore-1809, 17-jre-windowsservercore-1809 | |
| SharedTags: 17.0.12_7-jre-windowsservercore, 17-jre-windowsservercore, 17.0.12_7-jre, 17-jre | |
| Architectures: windows-amd64 | |
| -GitCommit: f7ce125dc28d8c0d065d94829e63094daa018ca3 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jre/windows/windowsservercore-1809 | |
| Builder: classic | |
| Constraints: windowsservercore-1809 | |
| @@ -340,25 +340,25 @@ Constraints: windowsservercore-1809 | |
| Tags: 17.0.12_7-jre-windowsservercore-ltsc2022, 17-jre-windowsservercore-ltsc2022 | |
| SharedTags: 17.0.12_7-jre-windowsservercore, 17-jre-windowsservercore, 17.0.12_7-jre, 17-jre | |
| Architectures: windows-amd64 | |
| -GitCommit: f7ce125dc28d8c0d065d94829e63094daa018ca3 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 17/jre/windows/windowsservercore-ltsc2022 | |
| Builder: classic | |
| Constraints: windowsservercore-ltsc2022 | |
| Tags: 21.0.4_7-jdk-alpine, 21-jdk-alpine, 21-alpine | |
| Architectures: amd64, arm64v8 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jdk/alpine | |
| Tags: 21.0.4_7-jdk-jammy, 21-jdk-jammy, 21-jammy | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jdk/ubuntu/jammy | |
| Tags: 21.0.4_7-jdk-nanoserver-1809, 21-jdk-nanoserver-1809, 21-nanoserver-1809 | |
| SharedTags: 21.0.4_7-jdk-nanoserver, 21-jdk-nanoserver, 21-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 6e6c1cc0d915b330e3c474a9bf21d92fc4e5f157 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jdk/windows/nanoserver-1809 | |
| Builder: classic | |
| Constraints: nanoserver-1809, windowsservercore-1809 | |
| @@ -366,26 +366,26 @@ Constraints: nanoserver-1809, windowsservercore-1809 | |
| Tags: 21.0.4_7-jdk-nanoserver-ltsc2022, 21-jdk-nanoserver-ltsc2022, 21-nanoserver-ltsc2022 | |
| SharedTags: 21.0.4_7-jdk-nanoserver, 21-jdk-nanoserver, 21-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 6e6c1cc0d915b330e3c474a9bf21d92fc4e5f157 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jdk/windows/nanoserver-ltsc2022 | |
| Builder: classic | |
| Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| Tags: 21.0.4_7-jdk-noble, 21-jdk-noble, 21-noble | |
| SharedTags: 21.0.4_7-jdk, 21-jdk, 21, latest | |
| -Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +Architectures: amd64, arm64v8, ppc64le, riscv64, s390x | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jdk/ubuntu/noble | |
| Tags: 21.0.4_7-jdk-ubi9-minimal, 21-jdk-ubi9-minimal, 21-ubi9-minimal | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jdk/ubi/ubi9-minimal | |
| Tags: 21.0.4_7-jdk-windowsservercore-1809, 21-jdk-windowsservercore-1809, 21-windowsservercore-1809 | |
| SharedTags: 21.0.4_7-jdk-windowsservercore, 21-jdk-windowsservercore, 21-windowsservercore, 21.0.4_7-jdk, 21-jdk, 21, latest | |
| Architectures: windows-amd64 | |
| -GitCommit: 6e6c1cc0d915b330e3c474a9bf21d92fc4e5f157 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jdk/windows/windowsservercore-1809 | |
| Builder: classic | |
| Constraints: windowsservercore-1809 | |
| @@ -393,25 +393,25 @@ Constraints: windowsservercore-1809 | |
| Tags: 21.0.4_7-jdk-windowsservercore-ltsc2022, 21-jdk-windowsservercore-ltsc2022, 21-windowsservercore-ltsc2022 | |
| SharedTags: 21.0.4_7-jdk-windowsservercore, 21-jdk-windowsservercore, 21-windowsservercore, 21.0.4_7-jdk, 21-jdk, 21, latest | |
| Architectures: windows-amd64 | |
| -GitCommit: 6e6c1cc0d915b330e3c474a9bf21d92fc4e5f157 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jdk/windows/windowsservercore-ltsc2022 | |
| Builder: classic | |
| Constraints: windowsservercore-ltsc2022 | |
| Tags: 21.0.4_7-jre-alpine, 21-jre-alpine | |
| Architectures: amd64, arm64v8 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jre/alpine | |
| Tags: 21.0.4_7-jre-jammy, 21-jre-jammy | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jre/ubuntu/jammy | |
| Tags: 21.0.4_7-jre-nanoserver-1809, 21-jre-nanoserver-1809 | |
| SharedTags: 21.0.4_7-jre-nanoserver, 21-jre-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 6e6c1cc0d915b330e3c474a9bf21d92fc4e5f157 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jre/windows/nanoserver-1809 | |
| Builder: classic | |
| Constraints: nanoserver-1809, windowsservercore-1809 | |
| @@ -419,26 +419,26 @@ Constraints: nanoserver-1809, windowsservercore-1809 | |
| Tags: 21.0.4_7-jre-nanoserver-ltsc2022, 21-jre-nanoserver-ltsc2022 | |
| SharedTags: 21.0.4_7-jre-nanoserver, 21-jre-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 6e6c1cc0d915b330e3c474a9bf21d92fc4e5f157 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jre/windows/nanoserver-ltsc2022 | |
| Builder: classic | |
| Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| Tags: 21.0.4_7-jre-noble, 21-jre-noble | |
| SharedTags: 21.0.4_7-jre, 21-jre | |
| -Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +Architectures: amd64, arm64v8, ppc64le, riscv64, s390x | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jre/ubuntu/noble | |
| Tags: 21.0.4_7-jre-ubi9-minimal, 21-jre-ubi9-minimal | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jre/ubi/ubi9-minimal | |
| Tags: 21.0.4_7-jre-windowsservercore-1809, 21-jre-windowsservercore-1809 | |
| SharedTags: 21.0.4_7-jre-windowsservercore, 21-jre-windowsservercore, 21.0.4_7-jre, 21-jre | |
| Architectures: windows-amd64 | |
| -GitCommit: 6e6c1cc0d915b330e3c474a9bf21d92fc4e5f157 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jre/windows/windowsservercore-1809 | |
| Builder: classic | |
| Constraints: windowsservercore-1809 | |
| @@ -446,25 +446,25 @@ Constraints: windowsservercore-1809 | |
| Tags: 21.0.4_7-jre-windowsservercore-ltsc2022, 21-jre-windowsservercore-ltsc2022 | |
| SharedTags: 21.0.4_7-jre-windowsservercore, 21-jre-windowsservercore, 21.0.4_7-jre, 21-jre | |
| Architectures: windows-amd64 | |
| -GitCommit: 6e6c1cc0d915b330e3c474a9bf21d92fc4e5f157 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 21/jre/windows/windowsservercore-ltsc2022 | |
| Builder: classic | |
| Constraints: windowsservercore-ltsc2022 | |
| Tags: 22.0.2_9-jdk-alpine, 22-jdk-alpine, 22-alpine | |
| Architectures: amd64, arm64v8 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jdk/alpine | |
| Tags: 22.0.2_9-jdk-jammy, 22-jdk-jammy, 22-jammy | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jdk/ubuntu/jammy | |
| Tags: 22.0.2_9-jdk-nanoserver-1809, 22-jdk-nanoserver-1809, 22-nanoserver-1809 | |
| SharedTags: 22.0.2_9-jdk-nanoserver, 22-jdk-nanoserver, 22-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jdk/windows/nanoserver-1809 | |
| Builder: classic | |
| Constraints: nanoserver-1809, windowsservercore-1809 | |
| @@ -472,26 +472,26 @@ Constraints: nanoserver-1809, windowsservercore-1809 | |
| Tags: 22.0.2_9-jdk-nanoserver-ltsc2022, 22-jdk-nanoserver-ltsc2022, 22-nanoserver-ltsc2022 | |
| SharedTags: 22.0.2_9-jdk-nanoserver, 22-jdk-nanoserver, 22-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jdk/windows/nanoserver-ltsc2022 | |
| Builder: classic | |
| Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| Tags: 22.0.2_9-jdk-noble, 22-jdk-noble, 22-noble | |
| SharedTags: 22.0.2_9-jdk, 22-jdk, 22 | |
| -Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +Architectures: amd64, arm64v8, ppc64le, riscv64, s390x | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jdk/ubuntu/noble | |
| Tags: 22.0.2_9-jdk-ubi9-minimal, 22-jdk-ubi9-minimal, 22-ubi9-minimal | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jdk/ubi/ubi9-minimal | |
| Tags: 22.0.2_9-jdk-windowsservercore-1809, 22-jdk-windowsservercore-1809, 22-windowsservercore-1809 | |
| SharedTags: 22.0.2_9-jdk-windowsservercore, 22-jdk-windowsservercore, 22-windowsservercore, 22.0.2_9-jdk, 22-jdk, 22 | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jdk/windows/windowsservercore-1809 | |
| Builder: classic | |
| Constraints: windowsservercore-1809 | |
| @@ -499,25 +499,25 @@ Constraints: windowsservercore-1809 | |
| Tags: 22.0.2_9-jdk-windowsservercore-ltsc2022, 22-jdk-windowsservercore-ltsc2022, 22-windowsservercore-ltsc2022 | |
| SharedTags: 22.0.2_9-jdk-windowsservercore, 22-jdk-windowsservercore, 22-windowsservercore, 22.0.2_9-jdk, 22-jdk, 22 | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jdk/windows/windowsservercore-ltsc2022 | |
| Builder: classic | |
| Constraints: windowsservercore-ltsc2022 | |
| Tags: 22.0.2_9-jre-alpine, 22-jre-alpine | |
| Architectures: amd64, arm64v8 | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jre/alpine | |
| Tags: 22.0.2_9-jre-jammy, 22-jre-jammy | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jre/ubuntu/jammy | |
| Tags: 22.0.2_9-jre-nanoserver-1809, 22-jre-nanoserver-1809 | |
| SharedTags: 22.0.2_9-jre-nanoserver, 22-jre-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jre/windows/nanoserver-1809 | |
| Builder: classic | |
| Constraints: nanoserver-1809, windowsservercore-1809 | |
| @@ -525,26 +525,26 @@ Constraints: nanoserver-1809, windowsservercore-1809 | |
| Tags: 22.0.2_9-jre-nanoserver-ltsc2022, 22-jre-nanoserver-ltsc2022 | |
| SharedTags: 22.0.2_9-jre-nanoserver, 22-jre-nanoserver | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jre/windows/nanoserver-ltsc2022 | |
| Builder: classic | |
| Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022 | |
| Tags: 22.0.2_9-jre-noble, 22-jre-noble | |
| SharedTags: 22.0.2_9-jre, 22-jre | |
| -Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +Architectures: amd64, arm64v8, ppc64le, riscv64, s390x | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jre/ubuntu/noble | |
| Tags: 22.0.2_9-jre-ubi9-minimal, 22-jre-ubi9-minimal | |
| Architectures: amd64, arm64v8, ppc64le, s390x | |
| -GitCommit: 43fcefc483338727126a5263d7110f5711ad8506 | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jre/ubi/ubi9-minimal | |
| Tags: 22.0.2_9-jre-windowsservercore-1809, 22-jre-windowsservercore-1809 | |
| SharedTags: 22.0.2_9-jre-windowsservercore, 22-jre-windowsservercore, 22.0.2_9-jre, 22-jre | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jre/windows/windowsservercore-1809 | |
| Builder: classic | |
| Constraints: windowsservercore-1809 | |
| @@ -552,7 +552,7 @@ Constraints: windowsservercore-1809 | |
| Tags: 22.0.2_9-jre-windowsservercore-ltsc2022, 22-jre-windowsservercore-ltsc2022 | |
| SharedTags: 22.0.2_9-jre-windowsservercore, 22-jre-windowsservercore, 22.0.2_9-jre, 22-jre | |
| Architectures: windows-amd64 | |
| -GitCommit: 48ce959533cd2146eb94d626938b683b5b013cfc | |
| +GitCommit: 07677395574f5d3462c3b6fdf5f6c4a0a350b683 | |
| Directory: 22/jre/windows/windowsservercore-ltsc2022 | |
| Builder: classic | |
| Constraints: windowsservercore-ltsc2022 | |
| diff --git a/eclipse-temurin_11-alpine/Dockerfile b/eclipse-temurin_11-alpine/Dockerfile | |
| index 8443793..27e8199 100644 | |
| --- a/eclipse-temurin_11-alpine/Dockerfile | |
| +++ b/eclipse-temurin_11-alpine/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM alpine:3.20 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -45,7 +45,7 @@ RUN set -eux; \ | |
| ; \ | |
| rm -rf /var/cache/apk/* | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN set -eux; \ | |
| ARCH="$(apk --print-arch)"; \ | |
| @@ -76,7 +76,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_11-alpine/entrypoint.sh b/eclipse-temurin_11-alpine/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..306dd4c | |
| --- a/eclipse-temurin_11-alpine/entrypoint.sh | |
| +++ b/eclipse-temurin_11-alpine/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_11-focal/Dockerfile b/eclipse-temurin_11-focal/Dockerfile | |
| index ced4de7..74465ec 100644 | |
| --- a/eclipse-temurin_11-focal/Dockerfile | |
| +++ b/eclipse-temurin_11-focal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:20.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -99,7 +99,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_11-focal/entrypoint.sh b/eclipse-temurin_11-focal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_11-focal/entrypoint.sh | |
| +++ b/eclipse-temurin_11-focal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_11-jammy/Dockerfile b/eclipse-temurin_11-jammy/Dockerfile | |
| index 6f5d50b..d0ec562 100644 | |
| --- a/eclipse-temurin_11-jammy/Dockerfile | |
| +++ b/eclipse-temurin_11-jammy/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:22.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -99,7 +99,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_11-jammy/entrypoint.sh b/eclipse-temurin_11-jammy/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_11-jammy/entrypoint.sh | |
| +++ b/eclipse-temurin_11-jammy/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_11-jre-alpine/Dockerfile b/eclipse-temurin_11-jre-alpine/Dockerfile | |
| index c02f16c..3b8aa07 100644 | |
| --- a/eclipse-temurin_11-jre-alpine/Dockerfile | |
| +++ b/eclipse-temurin_11-jre-alpine/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM alpine:3.20 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -45,7 +45,7 @@ RUN set -eux; \ | |
| ; \ | |
| rm -rf /var/cache/apk/* | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN set -eux; \ | |
| ARCH="$(apk --print-arch)"; \ | |
| @@ -74,5 +74,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_11-jre-alpine/entrypoint.sh b/eclipse-temurin_11-jre-alpine/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..306dd4c | |
| --- a/eclipse-temurin_11-jre-alpine/entrypoint.sh | |
| +++ b/eclipse-temurin_11-jre-alpine/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_11-jre-focal/Dockerfile b/eclipse-temurin_11-jre-focal/Dockerfile | |
| index bbf2da3..45260fa 100644 | |
| --- a/eclipse-temurin_11-jre-focal/Dockerfile | |
| +++ b/eclipse-temurin_11-jre-focal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:20.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -97,5 +97,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_11-jre-focal/entrypoint.sh b/eclipse-temurin_11-jre-focal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_11-jre-focal/entrypoint.sh | |
| +++ b/eclipse-temurin_11-jre-focal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_11-jre-jammy/Dockerfile b/eclipse-temurin_11-jre-jammy/Dockerfile | |
| index e83a6b1..cb0babb 100644 | |
| --- a/eclipse-temurin_11-jre-jammy/Dockerfile | |
| +++ b/eclipse-temurin_11-jre-jammy/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:22.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -97,5 +97,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_11-jre-jammy/entrypoint.sh b/eclipse-temurin_11-jre-jammy/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_11-jre-jammy/entrypoint.sh | |
| +++ b/eclipse-temurin_11-jre-jammy/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_11-jre-nanoserver-1809/Dockerfile b/eclipse-temurin_11-jre-nanoserver-1809/Dockerfile | |
| index ebac551..14a0961 100644 | |
| --- a/eclipse-temurin_11-jre-nanoserver-1809/Dockerfile | |
| +++ b/eclipse-temurin_11-jre-nanoserver-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| ENV JAVA_HOME C:\\openjdk-11 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_11-jre-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_11-jre-nanoserver-ltsc2022/Dockerfile | |
| index bcbfdc1..00f5409 100644 | |
| --- a/eclipse-temurin_11-jre-nanoserver-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_11-jre-nanoserver-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| ENV JAVA_HOME C:\\openjdk-11 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_11-jre-noble/Dockerfile b/eclipse-temurin_11-jre-noble/Dockerfile | |
| index 823e6c3..79e18b5 100644 | |
| --- a/eclipse-temurin_11-jre-noble/Dockerfile | |
| +++ b/eclipse-temurin_11-jre-noble/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:24.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -97,5 +97,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_11-jre-noble/entrypoint.sh b/eclipse-temurin_11-jre-noble/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_11-jre-noble/entrypoint.sh | |
| +++ b/eclipse-temurin_11-jre-noble/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile b/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile | |
| index 492b564..0d35490 100644 | |
| --- a/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile | |
| +++ b/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM redhat/ubi9-minimal | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| ; \ | |
| microdnf clean all | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN set -eux; \ | |
| ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ | |
| @@ -85,5 +85,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_11-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_11-jre-ubi9-minimal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..c00c032 | |
| --- a/eclipse-temurin_11-jre-ubi9-minimal/entrypoint.sh | |
| +++ b/eclipse-temurin_11-jre-ubi9-minimal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| - cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| - fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| - update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_11-jre-windowsservercore-1809/Dockerfile b/eclipse-temurin_11-jre-windowsservercore-1809/Dockerfile | |
| index b454244..5d04cb2 100644 | |
| --- a/eclipse-temurin_11-jre-windowsservercore-1809/Dockerfile | |
| +++ b/eclipse-temurin_11-jre-windowsservercore-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ; \ | |
| diff --git a/eclipse-temurin_11-jre-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_11-jre-windowsservercore-ltsc2022/Dockerfile | |
| index 9c5b596..0bfb2ac 100644 | |
| --- a/eclipse-temurin_11-jre-windowsservercore-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_11-jre-windowsservercore-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ; \ | |
| diff --git a/eclipse-temurin_11-nanoserver-1809/Dockerfile b/eclipse-temurin_11-nanoserver-1809/Dockerfile | |
| index 608383f..d0f9578 100644 | |
| --- a/eclipse-temurin_11-nanoserver-1809/Dockerfile | |
| +++ b/eclipse-temurin_11-nanoserver-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| ENV JAVA_HOME C:\\openjdk-11 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_11-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_11-nanoserver-ltsc2022/Dockerfile | |
| index dc1c163..68ed2b1 100644 | |
| --- a/eclipse-temurin_11-nanoserver-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_11-nanoserver-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| ENV JAVA_HOME C:\\openjdk-11 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_11-noble/Dockerfile b/eclipse-temurin_11-noble/Dockerfile | |
| index 6d99766..7e5d440 100644 | |
| --- a/eclipse-temurin_11-noble/Dockerfile | |
| +++ b/eclipse-temurin_11-noble/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:24.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -99,7 +99,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_11-noble/entrypoint.sh b/eclipse-temurin_11-noble/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_11-noble/entrypoint.sh | |
| +++ b/eclipse-temurin_11-noble/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_11-ubi9-minimal/Dockerfile b/eclipse-temurin_11-ubi9-minimal/Dockerfile | |
| index 783c1c3..0f15df1 100644 | |
| --- a/eclipse-temurin_11-ubi9-minimal/Dockerfile | |
| +++ b/eclipse-temurin_11-ubi9-minimal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM redhat/ubi9-minimal | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| ; \ | |
| microdnf clean all | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN set -eux; \ | |
| ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ | |
| @@ -87,7 +87,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_11-ubi9-minimal/entrypoint.sh b/eclipse-temurin_11-ubi9-minimal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..c00c032 | |
| --- a/eclipse-temurin_11-ubi9-minimal/entrypoint.sh | |
| +++ b/eclipse-temurin_11-ubi9-minimal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| - cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| - fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| - update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_11-windowsservercore-1809/Dockerfile b/eclipse-temurin_11-windowsservercore-1809/Dockerfile | |
| index dd1d760..707c525 100644 | |
| --- a/eclipse-temurin_11-windowsservercore-1809/Dockerfile | |
| +++ b/eclipse-temurin_11-windowsservercore-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ; \ | |
| diff --git a/eclipse-temurin_11-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_11-windowsservercore-ltsc2022/Dockerfile | |
| index 9fe8159..e21fbf8 100644 | |
| --- a/eclipse-temurin_11-windowsservercore-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_11-windowsservercore-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-11.0.24+8 | |
| +ENV JAVA_VERSION=jdk-11.0.24+8 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ; \ | |
| diff --git a/eclipse-temurin_17-alpine/Dockerfile b/eclipse-temurin_17-alpine/Dockerfile | |
| index f351d29..cd77a10 100644 | |
| --- a/eclipse-temurin_17-alpine/Dockerfile | |
| +++ b/eclipse-temurin_17-alpine/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM alpine:3.20 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -48,7 +48,7 @@ RUN set -eux; \ | |
| ; \ | |
| rm -rf /var/cache/apk/* | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN set -eux; \ | |
| ARCH="$(apk --print-arch)"; \ | |
| @@ -79,7 +79,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_17-alpine/entrypoint.sh b/eclipse-temurin_17-alpine/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..306dd4c | |
| --- a/eclipse-temurin_17-alpine/entrypoint.sh | |
| +++ b/eclipse-temurin_17-alpine/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_17-focal/Dockerfile b/eclipse-temurin_17-focal/Dockerfile | |
| index 669e713..03fa063 100644 | |
| --- a/eclipse-temurin_17-focal/Dockerfile | |
| +++ b/eclipse-temurin_17-focal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:20.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -49,7 +49,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -102,7 +102,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_17-focal/entrypoint.sh b/eclipse-temurin_17-focal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_17-focal/entrypoint.sh | |
| +++ b/eclipse-temurin_17-focal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_17-jammy/Dockerfile b/eclipse-temurin_17-jammy/Dockerfile | |
| index 9cdf277..8c8bec5 100644 | |
| --- a/eclipse-temurin_17-jammy/Dockerfile | |
| +++ b/eclipse-temurin_17-jammy/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:22.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -49,7 +49,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -102,7 +102,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_17-jammy/entrypoint.sh b/eclipse-temurin_17-jammy/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_17-jammy/entrypoint.sh | |
| +++ b/eclipse-temurin_17-jammy/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_17-jre-alpine/Dockerfile b/eclipse-temurin_17-jre-alpine/Dockerfile | |
| index 29fc49a..f0479b5 100644 | |
| --- a/eclipse-temurin_17-jre-alpine/Dockerfile | |
| +++ b/eclipse-temurin_17-jre-alpine/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM alpine:3.20 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -45,7 +45,7 @@ RUN set -eux; \ | |
| ; \ | |
| rm -rf /var/cache/apk/* | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN set -eux; \ | |
| ARCH="$(apk --print-arch)"; \ | |
| @@ -74,5 +74,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_17-jre-alpine/entrypoint.sh b/eclipse-temurin_17-jre-alpine/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..306dd4c | |
| --- a/eclipse-temurin_17-jre-alpine/entrypoint.sh | |
| +++ b/eclipse-temurin_17-jre-alpine/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_17-jre-focal/Dockerfile b/eclipse-temurin_17-jre-focal/Dockerfile | |
| index 40c4b1b..70027ca 100644 | |
| --- a/eclipse-temurin_17-jre-focal/Dockerfile | |
| +++ b/eclipse-temurin_17-jre-focal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:20.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -97,5 +97,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_17-jre-focal/entrypoint.sh b/eclipse-temurin_17-jre-focal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_17-jre-focal/entrypoint.sh | |
| +++ b/eclipse-temurin_17-jre-focal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_17-jre-jammy/Dockerfile b/eclipse-temurin_17-jre-jammy/Dockerfile | |
| index 0411cbc..5936957 100644 | |
| --- a/eclipse-temurin_17-jre-jammy/Dockerfile | |
| +++ b/eclipse-temurin_17-jre-jammy/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:22.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -97,5 +97,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_17-jre-jammy/entrypoint.sh b/eclipse-temurin_17-jre-jammy/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_17-jre-jammy/entrypoint.sh | |
| +++ b/eclipse-temurin_17-jre-jammy/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_17-jre-nanoserver-1809/Dockerfile b/eclipse-temurin_17-jre-nanoserver-1809/Dockerfile | |
| index f77a12c..ad4d750 100644 | |
| --- a/eclipse-temurin_17-jre-nanoserver-1809/Dockerfile | |
| +++ b/eclipse-temurin_17-jre-nanoserver-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| ENV JAVA_HOME C:\\openjdk-17 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_17-jre-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_17-jre-nanoserver-ltsc2022/Dockerfile | |
| index 6d0d7a5..30eba22 100644 | |
| --- a/eclipse-temurin_17-jre-nanoserver-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_17-jre-nanoserver-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| ENV JAVA_HOME C:\\openjdk-17 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_17-jre-noble/Dockerfile b/eclipse-temurin_17-jre-noble/Dockerfile | |
| index 7e32e9b..f40d7b4 100644 | |
| --- a/eclipse-temurin_17-jre-noble/Dockerfile | |
| +++ b/eclipse-temurin_17-jre-noble/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:24.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -67,6 +67,10 @@ RUN set -eux; \ | |
| ESUM='2759c48e1e56117871b04c851af18b92b6992cf67590f602949b96c3cff15c73'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.12_7.tar.gz'; \ | |
| ;; \ | |
| + riscv64) \ | |
| + ESUM='2d1ed42918305a1a0754a6e1e9294c7d4d7fda4bff6dba7bc5682037d860dbc9'; \ | |
| + BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.12_7.tar.gz'; \ | |
| + ;; \ | |
| s390x) \ | |
| ESUM='cb1a3857d10e9353862761ce3c6b45573a736ea95cea44bc02dc3a703e57255a'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_s390x_linux_hotspot_17.0.12_7.tar.gz'; \ | |
| @@ -97,5 +101,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_17-jre-noble/entrypoint.sh b/eclipse-temurin_17-jre-noble/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_17-jre-noble/entrypoint.sh | |
| +++ b/eclipse-temurin_17-jre-noble/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile b/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile | |
| index 9fe05cb..8d86313 100644 | |
| --- a/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile | |
| +++ b/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM redhat/ubi9-minimal | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| ; \ | |
| microdnf clean all | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN set -eux; \ | |
| ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ | |
| @@ -85,5 +85,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_17-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_17-jre-ubi9-minimal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..c00c032 | |
| --- a/eclipse-temurin_17-jre-ubi9-minimal/entrypoint.sh | |
| +++ b/eclipse-temurin_17-jre-ubi9-minimal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| - cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| - fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| - update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_17-jre-windowsservercore-1809/Dockerfile b/eclipse-temurin_17-jre-windowsservercore-1809/Dockerfile | |
| index 0dea887..da8c3af 100644 | |
| --- a/eclipse-temurin_17-jre-windowsservercore-1809/Dockerfile | |
| +++ b/eclipse-temurin_17-jre-windowsservercore-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ; \ | |
| diff --git a/eclipse-temurin_17-jre-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_17-jre-windowsservercore-ltsc2022/Dockerfile | |
| index 16da9b0..f6086c2 100644 | |
| --- a/eclipse-temurin_17-jre-windowsservercore-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_17-jre-windowsservercore-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ; \ | |
| diff --git a/eclipse-temurin_17-nanoserver-1809/Dockerfile b/eclipse-temurin_17-nanoserver-1809/Dockerfile | |
| index 576ccdd..4e86ec4 100644 | |
| --- a/eclipse-temurin_17-nanoserver-1809/Dockerfile | |
| +++ b/eclipse-temurin_17-nanoserver-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| ENV JAVA_HOME C:\\openjdk-17 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_17-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_17-nanoserver-ltsc2022/Dockerfile | |
| index 0b2c7d4..be1c2e2 100644 | |
| --- a/eclipse-temurin_17-nanoserver-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_17-nanoserver-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| ENV JAVA_HOME C:\\openjdk-17 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_17-noble/Dockerfile b/eclipse-temurin_17-noble/Dockerfile | |
| index ca0f958..fb52846 100644 | |
| --- a/eclipse-temurin_17-noble/Dockerfile | |
| +++ b/eclipse-temurin_17-noble/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:24.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -49,7 +49,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -70,6 +70,10 @@ RUN set -eux; \ | |
| ESUM='c97988e5a99b8ae0c47ba330b0883398c7433312db0051d8c5ff97911bae1605'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.12_7.tar.gz'; \ | |
| ;; \ | |
| + riscv64) \ | |
| + ESUM='d024c100eba4709970716ddcac757ba5e3122a8ff9c6f539ff8bac5b47f51f3a'; \ | |
| + BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz'; \ | |
| + ;; \ | |
| s390x) \ | |
| ESUM='e244947f4c9176bd559598874b6ecaafcabba19c7067271cebb78708c2e9d14f'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.12_7.tar.gz'; \ | |
| @@ -102,7 +106,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_17-noble/entrypoint.sh b/eclipse-temurin_17-noble/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_17-noble/entrypoint.sh | |
| +++ b/eclipse-temurin_17-noble/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_17-ubi9-minimal/Dockerfile b/eclipse-temurin_17-ubi9-minimal/Dockerfile | |
| index 7cc7598..98a559a 100644 | |
| --- a/eclipse-temurin_17-ubi9-minimal/Dockerfile | |
| +++ b/eclipse-temurin_17-ubi9-minimal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM redhat/ubi9-minimal | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| ; \ | |
| microdnf clean all | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN set -eux; \ | |
| ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ | |
| @@ -87,7 +87,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_17-ubi9-minimal/entrypoint.sh b/eclipse-temurin_17-ubi9-minimal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..c00c032 | |
| --- a/eclipse-temurin_17-ubi9-minimal/entrypoint.sh | |
| +++ b/eclipse-temurin_17-ubi9-minimal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| - cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| - fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| - update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_17-windowsservercore-1809/Dockerfile b/eclipse-temurin_17-windowsservercore-1809/Dockerfile | |
| index a760aaf..efdcdc0 100644 | |
| --- a/eclipse-temurin_17-windowsservercore-1809/Dockerfile | |
| +++ b/eclipse-temurin_17-windowsservercore-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ; \ | |
| diff --git a/eclipse-temurin_17-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_17-windowsservercore-ltsc2022/Dockerfile | |
| index 436d4fd..8d98eaf 100644 | |
| --- a/eclipse-temurin_17-windowsservercore-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_17-windowsservercore-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-17.0.12+7 | |
| +ENV JAVA_VERSION=jdk-17.0.12+7 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ; \ | |
| diff --git a/eclipse-temurin_21-alpine/Dockerfile b/eclipse-temurin_21-alpine/Dockerfile | |
| index c9f2751..c62668a 100644 | |
| --- a/eclipse-temurin_21-alpine/Dockerfile | |
| +++ b/eclipse-temurin_21-alpine/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM alpine:3.20 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -48,7 +48,7 @@ RUN set -eux; \ | |
| ; \ | |
| rm -rf /var/cache/apk/* | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN set -eux; \ | |
| ARCH="$(apk --print-arch)"; \ | |
| @@ -83,7 +83,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_21-alpine/entrypoint.sh b/eclipse-temurin_21-alpine/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..306dd4c | |
| --- a/eclipse-temurin_21-alpine/entrypoint.sh | |
| +++ b/eclipse-temurin_21-alpine/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_21-jammy/Dockerfile b/eclipse-temurin_21-jammy/Dockerfile | |
| index 17732f4..061af25 100644 | |
| --- a/eclipse-temurin_21-jammy/Dockerfile | |
| +++ b/eclipse-temurin_21-jammy/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:22.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -49,7 +49,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -98,7 +98,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_21-jammy/entrypoint.sh b/eclipse-temurin_21-jammy/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_21-jammy/entrypoint.sh | |
| +++ b/eclipse-temurin_21-jammy/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_21-jre-alpine/Dockerfile b/eclipse-temurin_21-jre-alpine/Dockerfile | |
| index 4b59fbe..ea62602 100644 | |
| --- a/eclipse-temurin_21-jre-alpine/Dockerfile | |
| +++ b/eclipse-temurin_21-jre-alpine/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM alpine:3.20 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -45,7 +45,7 @@ RUN set -eux; \ | |
| ; \ | |
| rm -rf /var/cache/apk/* | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN set -eux; \ | |
| ARCH="$(apk --print-arch)"; \ | |
| @@ -78,5 +78,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_21-jre-alpine/entrypoint.sh b/eclipse-temurin_21-jre-alpine/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..306dd4c | |
| --- a/eclipse-temurin_21-jre-alpine/entrypoint.sh | |
| +++ b/eclipse-temurin_21-jre-alpine/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_21-jre-jammy/Dockerfile b/eclipse-temurin_21-jre-jammy/Dockerfile | |
| index c4e1bff..1671fea 100644 | |
| --- a/eclipse-temurin_21-jre-jammy/Dockerfile | |
| +++ b/eclipse-temurin_21-jre-jammy/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:22.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -93,5 +93,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_21-jre-jammy/entrypoint.sh b/eclipse-temurin_21-jre-jammy/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_21-jre-jammy/entrypoint.sh | |
| +++ b/eclipse-temurin_21-jre-jammy/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_21-jre-nanoserver-1809/Dockerfile b/eclipse-temurin_21-jre-nanoserver-1809/Dockerfile | |
| index 5f38cd5..b20591f 100644 | |
| --- a/eclipse-temurin_21-jre-nanoserver-1809/Dockerfile | |
| +++ b/eclipse-temurin_21-jre-nanoserver-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| ENV JAVA_HOME C:\\openjdk-21 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_21-jre-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_21-jre-nanoserver-ltsc2022/Dockerfile | |
| index 86eb14d..1c19caa 100644 | |
| --- a/eclipse-temurin_21-jre-nanoserver-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_21-jre-nanoserver-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| ENV JAVA_HOME C:\\openjdk-21 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_21-jre-noble/Dockerfile b/eclipse-temurin_21-jre-noble/Dockerfile | |
| index bcdb398..5c26aa8 100644 | |
| --- a/eclipse-temurin_21-jre-noble/Dockerfile | |
| +++ b/eclipse-temurin_21-jre-noble/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:24.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -63,6 +63,10 @@ RUN set -eux; \ | |
| ESUM='46cf93653e2b553fb1c91760cfe2ff20999ba358d648d2df69e5948784768440'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.4_7.tar.gz'; \ | |
| ;; \ | |
| + riscv64) \ | |
| + ESUM='bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237'; \ | |
| + BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz'; \ | |
| + ;; \ | |
| s390x) \ | |
| ESUM='7fb5b09987cb41de5118fecb5a81771b3a38a245cff411b39af33dbfbca3e760'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_s390x_linux_hotspot_21.0.4_7.tar.gz'; \ | |
| @@ -93,5 +97,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_21-jre-noble/entrypoint.sh b/eclipse-temurin_21-jre-noble/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_21-jre-noble/entrypoint.sh | |
| +++ b/eclipse-temurin_21-jre-noble/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_21-jre-ubi9-minimal/Dockerfile b/eclipse-temurin_21-jre-ubi9-minimal/Dockerfile | |
| index d3cfe95..f27213f 100644 | |
| --- a/eclipse-temurin_21-jre-ubi9-minimal/Dockerfile | |
| +++ b/eclipse-temurin_21-jre-ubi9-minimal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM redhat/ubi9-minimal | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| ; \ | |
| microdnf clean all | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN set -eux; \ | |
| ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ | |
| @@ -85,5 +85,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_21-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_21-jre-ubi9-minimal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..c00c032 | |
| --- a/eclipse-temurin_21-jre-ubi9-minimal/entrypoint.sh | |
| +++ b/eclipse-temurin_21-jre-ubi9-minimal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| - cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| - fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| - update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_21-jre-windowsservercore-1809/Dockerfile b/eclipse-temurin_21-jre-windowsservercore-1809/Dockerfile | |
| index 78a64ba..222455d 100644 | |
| --- a/eclipse-temurin_21-jre-windowsservercore-1809/Dockerfile | |
| +++ b/eclipse-temurin_21-jre-windowsservercore-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ; \ | |
| diff --git a/eclipse-temurin_21-jre-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_21-jre-windowsservercore-ltsc2022/Dockerfile | |
| index f72a689..25cb3af 100644 | |
| --- a/eclipse-temurin_21-jre-windowsservercore-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_21-jre-windowsservercore-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ; \ | |
| diff --git a/eclipse-temurin_21-nanoserver-1809/Dockerfile b/eclipse-temurin_21-nanoserver-1809/Dockerfile | |
| index a986f77..c86f7fb 100644 | |
| --- a/eclipse-temurin_21-nanoserver-1809/Dockerfile | |
| +++ b/eclipse-temurin_21-nanoserver-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| ENV JAVA_HOME C:\\openjdk-21 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_21-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_21-nanoserver-ltsc2022/Dockerfile | |
| index 6f667bb..5408206 100644 | |
| --- a/eclipse-temurin_21-nanoserver-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_21-nanoserver-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| ENV JAVA_HOME C:\\openjdk-21 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_21-noble/Dockerfile b/eclipse-temurin_21-noble/Dockerfile | |
| index bc43e03..faf3764 100644 | |
| --- a/eclipse-temurin_21-noble/Dockerfile | |
| +++ b/eclipse-temurin_21-noble/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:24.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -49,7 +49,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -66,6 +66,10 @@ RUN set -eux; \ | |
| ESUM='c208cd0fb90560644a90f928667d2f53bfe408c957a5e36206585ad874427761'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz'; \ | |
| ;; \ | |
| + riscv64) \ | |
| + ESUM='b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da'; \ | |
| + BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz'; \ | |
| + ;; \ | |
| s390x) \ | |
| ESUM='c900c8d64fab1e53274974fa4a4c736a5a3754485a5c56f4947281480773658a'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_s390x_linux_hotspot_21.0.4_7.tar.gz'; \ | |
| @@ -98,7 +102,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_21-noble/entrypoint.sh b/eclipse-temurin_21-noble/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_21-noble/entrypoint.sh | |
| +++ b/eclipse-temurin_21-noble/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_21-ubi9-minimal/Dockerfile b/eclipse-temurin_21-ubi9-minimal/Dockerfile | |
| index 2d6cfb2..2f6562a 100644 | |
| --- a/eclipse-temurin_21-ubi9-minimal/Dockerfile | |
| +++ b/eclipse-temurin_21-ubi9-minimal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM redhat/ubi9-minimal | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| ; \ | |
| microdnf clean all | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN set -eux; \ | |
| ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ | |
| @@ -87,7 +87,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_21-ubi9-minimal/entrypoint.sh b/eclipse-temurin_21-ubi9-minimal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..c00c032 | |
| --- a/eclipse-temurin_21-ubi9-minimal/entrypoint.sh | |
| +++ b/eclipse-temurin_21-ubi9-minimal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| - cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| - fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| - update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_21-windowsservercore-1809/Dockerfile b/eclipse-temurin_21-windowsservercore-1809/Dockerfile | |
| index 0570a10..a02936f 100644 | |
| --- a/eclipse-temurin_21-windowsservercore-1809/Dockerfile | |
| +++ b/eclipse-temurin_21-windowsservercore-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ; \ | |
| diff --git a/eclipse-temurin_21-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_21-windowsservercore-ltsc2022/Dockerfile | |
| index 31c272e..a2eb388 100644 | |
| --- a/eclipse-temurin_21-windowsservercore-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_21-windowsservercore-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-21.0.4+7 | |
| +ENV JAVA_VERSION=jdk-21.0.4+7 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ; \ | |
| diff --git a/eclipse-temurin_22-alpine/Dockerfile b/eclipse-temurin_22-alpine/Dockerfile | |
| index 79f1b57..2086669 100644 | |
| --- a/eclipse-temurin_22-alpine/Dockerfile | |
| +++ b/eclipse-temurin_22-alpine/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM alpine:3.20 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -48,7 +48,7 @@ RUN set -eux; \ | |
| ; \ | |
| rm -rf /var/cache/apk/* | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN set -eux; \ | |
| ARCH="$(apk --print-arch)"; \ | |
| @@ -83,7 +83,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_22-alpine/entrypoint.sh b/eclipse-temurin_22-alpine/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..306dd4c | |
| --- a/eclipse-temurin_22-alpine/entrypoint.sh | |
| +++ b/eclipse-temurin_22-alpine/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_22-jammy/Dockerfile b/eclipse-temurin_22-jammy/Dockerfile | |
| index 0a68998..f518473 100644 | |
| --- a/eclipse-temurin_22-jammy/Dockerfile | |
| +++ b/eclipse-temurin_22-jammy/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:22.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -47,7 +47,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -96,7 +96,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_22-jammy/entrypoint.sh b/eclipse-temurin_22-jammy/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_22-jammy/entrypoint.sh | |
| +++ b/eclipse-temurin_22-jammy/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_22-jre-alpine/Dockerfile b/eclipse-temurin_22-jre-alpine/Dockerfile | |
| index 01f77b4..600d752 100644 | |
| --- a/eclipse-temurin_22-jre-alpine/Dockerfile | |
| +++ b/eclipse-temurin_22-jre-alpine/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM alpine:3.20 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -45,7 +45,7 @@ RUN set -eux; \ | |
| ; \ | |
| rm -rf /var/cache/apk/* | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN set -eux; \ | |
| ARCH="$(apk --print-arch)"; \ | |
| @@ -78,5 +78,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_22-jre-alpine/entrypoint.sh b/eclipse-temurin_22-jre-alpine/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..306dd4c | |
| --- a/eclipse-temurin_22-jre-alpine/entrypoint.sh | |
| +++ b/eclipse-temurin_22-jre-alpine/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_22-jre-jammy/Dockerfile b/eclipse-temurin_22-jre-jammy/Dockerfile | |
| index 714892d..16affc3 100644 | |
| --- a/eclipse-temurin_22-jre-jammy/Dockerfile | |
| +++ b/eclipse-temurin_22-jre-jammy/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:22.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -91,5 +91,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_22-jre-jammy/entrypoint.sh b/eclipse-temurin_22-jre-jammy/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_22-jre-jammy/entrypoint.sh | |
| +++ b/eclipse-temurin_22-jre-jammy/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_22-jre-nanoserver-1809/Dockerfile b/eclipse-temurin_22-jre-nanoserver-1809/Dockerfile | |
| index 14df9cc..08888ab 100644 | |
| --- a/eclipse-temurin_22-jre-nanoserver-1809/Dockerfile | |
| +++ b/eclipse-temurin_22-jre-nanoserver-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| ENV JAVA_HOME C:\\openjdk-22 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_22-jre-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_22-jre-nanoserver-ltsc2022/Dockerfile | |
| index 7a66c39..e704f73 100644 | |
| --- a/eclipse-temurin_22-jre-nanoserver-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_22-jre-nanoserver-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| ENV JAVA_HOME C:\\openjdk-22 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_22-jre-noble/Dockerfile b/eclipse-temurin_22-jre-noble/Dockerfile | |
| index 65571a1..54439a0 100644 | |
| --- a/eclipse-temurin_22-jre-noble/Dockerfile | |
| +++ b/eclipse-temurin_22-jre-noble/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:24.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -61,6 +61,10 @@ RUN set -eux; \ | |
| ESUM='132191d6f23ad1ac558de67e3e9913d047db07efd979eb84bf5dc20a651ffe61'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_ppc64le_linux_hotspot_22.0.2_9.tar.gz'; \ | |
| ;; \ | |
| + riscv64) \ | |
| + ESUM='81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c'; \ | |
| + BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.2_9.tar.gz'; \ | |
| + ;; \ | |
| s390x) \ | |
| ESUM='4d9bc998c29fffcbbf752e9d0bf32391928a9e7a46edb1c5706e0f55b34a0c56'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_s390x_linux_hotspot_22.0.2_9.tar.gz'; \ | |
| @@ -91,5 +95,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_22-jre-noble/entrypoint.sh b/eclipse-temurin_22-jre-noble/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_22-jre-noble/entrypoint.sh | |
| +++ b/eclipse-temurin_22-jre-noble/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_22-jre-ubi9-minimal/Dockerfile b/eclipse-temurin_22-jre-ubi9-minimal/Dockerfile | |
| index 3f8715b..6683f51 100644 | |
| --- a/eclipse-temurin_22-jre-ubi9-minimal/Dockerfile | |
| +++ b/eclipse-temurin_22-jre-ubi9-minimal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM redhat/ubi9-minimal | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| ; \ | |
| microdnf clean all | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN set -eux; \ | |
| ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ | |
| @@ -85,5 +85,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_22-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_22-jre-ubi9-minimal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..c00c032 | |
| --- a/eclipse-temurin_22-jre-ubi9-minimal/entrypoint.sh | |
| +++ b/eclipse-temurin_22-jre-ubi9-minimal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| - cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| - fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| - update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_22-jre-windowsservercore-1809/Dockerfile b/eclipse-temurin_22-jre-windowsservercore-1809/Dockerfile | |
| index 98789cc..2e9753b 100644 | |
| --- a/eclipse-temurin_22-jre-windowsservercore-1809/Dockerfile | |
| +++ b/eclipse-temurin_22-jre-windowsservercore-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ; \ | |
| diff --git a/eclipse-temurin_22-jre-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_22-jre-windowsservercore-ltsc2022/Dockerfile | |
| index a10ea0a..1c993c1 100644 | |
| --- a/eclipse-temurin_22-jre-windowsservercore-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_22-jre-windowsservercore-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ; \ | |
| diff --git a/eclipse-temurin_22-nanoserver-1809/Dockerfile b/eclipse-temurin_22-nanoserver-1809/Dockerfile | |
| index f542b74..46c9515 100644 | |
| --- a/eclipse-temurin_22-nanoserver-1809/Dockerfile | |
| +++ b/eclipse-temurin_22-nanoserver-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| ENV JAVA_HOME C:\\openjdk-22 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_22-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_22-nanoserver-ltsc2022/Dockerfile | |
| index 1775334..36788c3 100644 | |
| --- a/eclipse-temurin_22-nanoserver-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_22-nanoserver-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| ENV JAVA_HOME C:\\openjdk-22 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_22-noble/Dockerfile b/eclipse-temurin_22-noble/Dockerfile | |
| index fa41d3d..f65312b 100644 | |
| --- a/eclipse-temurin_22-noble/Dockerfile | |
| +++ b/eclipse-temurin_22-noble/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:24.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -47,7 +47,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -64,6 +64,10 @@ RUN set -eux; \ | |
| ESUM='1d678752d58e33ff951e75736b8415d6d7ae136b2421ca02e993f2603e9b259b'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_ppc64le_linux_hotspot_22.0.2_9.tar.gz'; \ | |
| ;; \ | |
| + riscv64) \ | |
| + ESUM='830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389'; \ | |
| + BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.2_9.tar.gz'; \ | |
| + ;; \ | |
| s390x) \ | |
| ESUM='46527cfc560552f05c0462520d69d438f144a3dc8206687952387c910cdd4c40'; \ | |
| BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_s390x_linux_hotspot_22.0.2_9.tar.gz'; \ | |
| @@ -96,7 +100,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_22-noble/entrypoint.sh b/eclipse-temurin_22-noble/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_22-noble/entrypoint.sh | |
| +++ b/eclipse-temurin_22-noble/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_22-ubi9-minimal/Dockerfile b/eclipse-temurin_22-ubi9-minimal/Dockerfile | |
| index c7e9564..ffe29b2 100644 | |
| --- a/eclipse-temurin_22-ubi9-minimal/Dockerfile | |
| +++ b/eclipse-temurin_22-ubi9-minimal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM redhat/ubi9-minimal | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| ; \ | |
| microdnf clean all | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN set -eux; \ | |
| ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ | |
| @@ -87,7 +87,7 @@ RUN set -eux; \ | |
| echo "javac --version"; javac --version; \ | |
| echo "java --version"; java --version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| CMD ["jshell"] | |
| diff --git a/eclipse-temurin_22-ubi9-minimal/entrypoint.sh b/eclipse-temurin_22-ubi9-minimal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..c00c032 | |
| --- a/eclipse-temurin_22-ubi9-minimal/entrypoint.sh | |
| +++ b/eclipse-temurin_22-ubi9-minimal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| - cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| - fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| - update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_22-windowsservercore-1809/Dockerfile b/eclipse-temurin_22-windowsservercore-1809/Dockerfile | |
| index 3747109..503d25f 100644 | |
| --- a/eclipse-temurin_22-windowsservercore-1809/Dockerfile | |
| +++ b/eclipse-temurin_22-windowsservercore-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ; \ | |
| diff --git a/eclipse-temurin_22-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_22-windowsservercore-ltsc2022/Dockerfile | |
| index 6fd8c98..2ba0b56 100644 | |
| --- a/eclipse-temurin_22-windowsservercore-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_22-windowsservercore-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk-22.0.2+9 | |
| +ENV JAVA_VERSION=jdk-22.0.2+9 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ; \ | |
| diff --git a/eclipse-temurin_8-alpine/Dockerfile b/eclipse-temurin_8-alpine/Dockerfile | |
| index 2b79e9f..649eba7 100644 | |
| --- a/eclipse-temurin_8-alpine/Dockerfile | |
| +++ b/eclipse-temurin_8-alpine/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM alpine:3.20 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -45,7 +45,7 @@ RUN set -eux; \ | |
| ; \ | |
| rm -rf /var/cache/apk/* | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN set -eux; \ | |
| ARCH="$(apk --print-arch)"; \ | |
| @@ -75,5 +75,5 @@ RUN set -eux; \ | |
| echo "javac -version"; javac -version; \ | |
| echo "java -version"; java -version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_8-alpine/entrypoint.sh b/eclipse-temurin_8-alpine/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..25253b7 | |
| --- a/eclipse-temurin_8-alpine/entrypoint.sh | |
| +++ b/eclipse-temurin_8-alpine/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -8,12 +26,8 @@ set -e | |
| TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| -JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| - | |
| # JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| +JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +89,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_8-focal/Dockerfile b/eclipse-temurin_8-focal/Dockerfile | |
| index 6a91f96..e02ea26 100644 | |
| --- a/eclipse-temurin_8-focal/Dockerfile | |
| +++ b/eclipse-temurin_8-focal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:20.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -95,5 +95,5 @@ RUN set -eux; \ | |
| echo "javac -version"; javac -version; \ | |
| echo "java -version"; java -version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_8-focal/entrypoint.sh b/eclipse-temurin_8-focal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..129e5cc | |
| --- a/eclipse-temurin_8-focal/entrypoint.sh | |
| +++ b/eclipse-temurin_8-focal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -8,12 +26,8 @@ set -e | |
| TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| -JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| - | |
| # JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| +JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +89,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_8-jammy/Dockerfile b/eclipse-temurin_8-jammy/Dockerfile | |
| index a81eeb8..74ed432 100644 | |
| --- a/eclipse-temurin_8-jammy/Dockerfile | |
| +++ b/eclipse-temurin_8-jammy/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:22.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -95,5 +95,5 @@ RUN set -eux; \ | |
| echo "javac -version"; javac -version; \ | |
| echo "java -version"; java -version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_8-jammy/entrypoint.sh b/eclipse-temurin_8-jammy/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..129e5cc | |
| --- a/eclipse-temurin_8-jammy/entrypoint.sh | |
| +++ b/eclipse-temurin_8-jammy/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -8,12 +26,8 @@ set -e | |
| TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| -JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| - | |
| # JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| +JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +89,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_8-jre-alpine/Dockerfile b/eclipse-temurin_8-jre-alpine/Dockerfile | |
| index 5e2245f..e0daf20 100644 | |
| --- a/eclipse-temurin_8-jre-alpine/Dockerfile | |
| +++ b/eclipse-temurin_8-jre-alpine/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM alpine:3.20 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -45,7 +45,7 @@ RUN set -eux; \ | |
| ; \ | |
| rm -rf /var/cache/apk/* | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN set -eux; \ | |
| ARCH="$(apk --print-arch)"; \ | |
| @@ -74,5 +74,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java -version"; java -version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_8-jre-alpine/entrypoint.sh b/eclipse-temurin_8-jre-alpine/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..306dd4c | |
| --- a/eclipse-temurin_8-jre-alpine/entrypoint.sh | |
| +++ b/eclipse-temurin_8-jre-alpine/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_8-jre-focal/Dockerfile b/eclipse-temurin_8-jre-focal/Dockerfile | |
| index d3a1d52..6e50389 100644 | |
| --- a/eclipse-temurin_8-jre-focal/Dockerfile | |
| +++ b/eclipse-temurin_8-jre-focal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:20.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -94,5 +94,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java -version"; java -version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_8-jre-focal/entrypoint.sh b/eclipse-temurin_8-jre-focal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_8-jre-focal/entrypoint.sh | |
| +++ b/eclipse-temurin_8-jre-focal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_8-jre-jammy/Dockerfile b/eclipse-temurin_8-jre-jammy/Dockerfile | |
| index 88c1750..e2a00c8 100644 | |
| --- a/eclipse-temurin_8-jre-jammy/Dockerfile | |
| +++ b/eclipse-temurin_8-jre-jammy/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:22.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -94,5 +94,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java -version"; java -version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_8-jre-jammy/entrypoint.sh b/eclipse-temurin_8-jre-jammy/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_8-jre-jammy/entrypoint.sh | |
| +++ b/eclipse-temurin_8-jre-jammy/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_8-jre-nanoserver-1809/Dockerfile b/eclipse-temurin_8-jre-nanoserver-1809/Dockerfile | |
| index b198519..beeb064 100644 | |
| --- a/eclipse-temurin_8-jre-nanoserver-1809/Dockerfile | |
| +++ b/eclipse-temurin_8-jre-nanoserver-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| ENV JAVA_HOME C:\\openjdk-8 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_8-jre-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_8-jre-nanoserver-ltsc2022/Dockerfile | |
| index 9f4881c..9ea4aa2 100644 | |
| --- a/eclipse-temurin_8-jre-nanoserver-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_8-jre-nanoserver-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| ENV JAVA_HOME C:\\openjdk-8 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_8-jre-noble/Dockerfile b/eclipse-temurin_8-jre-noble/Dockerfile | |
| index 982b497..b068a24 100644 | |
| --- a/eclipse-temurin_8-jre-noble/Dockerfile | |
| +++ b/eclipse-temurin_8-jre-noble/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:24.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -94,5 +94,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java -version"; java -version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_8-jre-noble/entrypoint.sh b/eclipse-temurin_8-jre-noble/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..d51059c | |
| --- a/eclipse-temurin_8-jre-noble/entrypoint.sh | |
| +++ b/eclipse-temurin_8-jre-noble/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile b/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile | |
| index 582f238..ba1941e 100644 | |
| --- a/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile | |
| +++ b/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM redhat/ubi9-minimal | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| ; \ | |
| microdnf clean all | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN set -eux; \ | |
| ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ | |
| @@ -81,5 +81,5 @@ RUN set -eux; \ | |
| echo "Verifying install ..."; \ | |
| echo "java -version"; java -version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_8-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_8-jre-ubi9-minimal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..c00c032 | |
| --- a/eclipse-temurin_8-jre-ubi9-minimal/entrypoint.sh | |
| +++ b/eclipse-temurin_8-jre-ubi9-minimal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -10,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| -# JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| - | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +88,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| - cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| - fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| - update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_8-jre-windowsservercore-1809/Dockerfile b/eclipse-temurin_8-jre-windowsservercore-1809/Dockerfile | |
| index 05ee817..93c4c4f 100644 | |
| --- a/eclipse-temurin_8-jre-windowsservercore-1809/Dockerfile | |
| +++ b/eclipse-temurin_8-jre-windowsservercore-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ; \ | |
| diff --git a/eclipse-temurin_8-jre-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_8-jre-windowsservercore-ltsc2022/Dockerfile | |
| index 234c031..096ccd5 100644 | |
| --- a/eclipse-temurin_8-jre-windowsservercore-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_8-jre-windowsservercore-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ; \ | |
| diff --git a/eclipse-temurin_8-nanoserver-1809/Dockerfile b/eclipse-temurin_8-nanoserver-1809/Dockerfile | |
| index 17df0ca..f5069d5 100644 | |
| --- a/eclipse-temurin_8-nanoserver-1809/Dockerfile | |
| +++ b/eclipse-temurin_8-nanoserver-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| ENV JAVA_HOME C:\\openjdk-8 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_8-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_8-nanoserver-ltsc2022/Dockerfile | |
| index 3d5e2d9..6933b6e 100644 | |
| --- a/eclipse-temurin_8-nanoserver-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_8-nanoserver-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 | |
| SHELL ["cmd", "/s", "/c"] | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| ENV JAVA_HOME C:\\openjdk-8 | |
| # "ERROR: Access to the registry path is denied." | |
| diff --git a/eclipse-temurin_8-noble/Dockerfile b/eclipse-temurin_8-noble/Dockerfile | |
| index e4aa7a5..a9794a1 100644 | |
| --- a/eclipse-temurin_8-noble/Dockerfile | |
| +++ b/eclipse-temurin_8-noble/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM ubuntu:24.04 | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -46,7 +46,7 @@ RUN set -eux; \ | |
| locale-gen en_US.UTF-8; \ | |
| rm -rf /var/lib/apt/lists/* | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN set -eux; \ | |
| ARCH="$(dpkg --print-architecture)"; \ | |
| @@ -95,5 +95,5 @@ RUN set -eux; \ | |
| echo "javac -version"; javac -version; \ | |
| echo "java -version"; java -version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| +ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_8-noble/entrypoint.sh b/eclipse-temurin_8-noble/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..129e5cc | |
| --- a/eclipse-temurin_8-noble/entrypoint.sh | |
| +++ b/eclipse-temurin_8-noble/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| -#!/usr/bin/env sh | |
| +#!/usr/bin/env bash | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -8,12 +26,8 @@ set -e | |
| TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| -JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| - | |
| # JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| +JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +89,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| - update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_8-ubi9-minimal/Dockerfile b/eclipse-temurin_8-ubi9-minimal/Dockerfile | |
| index 030e63d..57a8755 100644 | |
| --- a/eclipse-temurin_8-ubi9-minimal/Dockerfile | |
| +++ b/eclipse-temurin_8-ubi9-minimal/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -19,8 +19,8 @@ | |
| FROM redhat/ubi9-minimal | |
| -ENV JAVA_HOME /opt/java/openjdk | |
| -ENV PATH $JAVA_HOME/bin:$PATH | |
| +ENV JAVA_HOME=/opt/java/openjdk | |
| +ENV PATH=$JAVA_HOME/bin:$PATH | |
| # Default to UTF-8 file.encoding | |
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' | |
| @@ -44,7 +44,7 @@ RUN set -eux; \ | |
| ; \ | |
| microdnf clean all | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN set -eux; \ | |
| ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ | |
| @@ -82,5 +82,5 @@ RUN set -eux; \ | |
| echo "javac -version"; javac -version; \ | |
| echo "java -version"; java -version; \ | |
| echo "Complete." | |
| -COPY entrypoint.sh /__cacert_entrypoint.sh | |
| +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh | |
| ENTRYPOINT ["/__cacert_entrypoint.sh"] | |
| diff --git a/eclipse-temurin_8-ubi9-minimal/entrypoint.sh b/eclipse-temurin_8-ubi9-minimal/entrypoint.sh | |
| old mode 100755 | |
| new mode 100644 | |
| index dcc51cd..9e44433 | |
| --- a/eclipse-temurin_8-ubi9-minimal/entrypoint.sh | |
| +++ b/eclipse-temurin_8-ubi9-minimal/entrypoint.sh | |
| @@ -1,4 +1,22 @@ | |
| #!/usr/bin/env sh | |
| +# ------------------------------------------------------------------------------ | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# | |
| +# PLEASE DO NOT EDIT IT DIRECTLY. | |
| +# ------------------------------------------------------------------------------ | |
| +# | |
| +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| +# you may not use this file except in compliance with the License. | |
| +# You may obtain a copy of the License at | |
| +# | |
| +# https://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get | |
| # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but | |
| # are supported by `sh` in some Linux flavours. | |
| @@ -8,12 +26,8 @@ set -e | |
| TMPDIR=${TMPDIR:-/tmp} | |
| # JDK truststore location | |
| -JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts | |
| - | |
| # JDK8 puts its JRE in a subdirectory | |
| -if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then | |
| - JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| -fi | |
| +JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts | |
| # Opt-in is only activated if the environment variable is set | |
| if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| @@ -75,27 +89,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then | |
| # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the | |
| # system location, for whatever reason. | |
| if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then | |
| - | |
| - # UBI | |
| - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then | |
| cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ | |
| fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if [ -d /usr/local/share/ca-certificates/ ]; then | |
| - cp -La /certificates/* /usr/local/share/ca-certificates/ | |
| - fi | |
| - fi | |
| - | |
| - # UBI | |
| - if command -v update-ca-trust >/dev/null; then | |
| update-ca-trust | |
| - fi | |
| - | |
| - # Ubuntu/Alpine | |
| - if command -v update-ca-certificates >/dev/null; then | |
| - update-ca-certificates | |
| - fi | |
| else | |
| # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, | |
| # but since the JVM is the primary focus here, we can live with that. | |
| diff --git a/eclipse-temurin_8-windowsservercore-1809/Dockerfile b/eclipse-temurin_8-windowsservercore-1809/Dockerfile | |
| index ed16e1d..d6feaeb 100644 | |
| --- a/eclipse-temurin_8-windowsservercore-1809/Dockerfile | |
| +++ b/eclipse-temurin_8-windowsservercore-1809/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ; \ | |
| diff --git a/eclipse-temurin_8-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_8-windowsservercore-ltsc2022/Dockerfile | |
| index 3bbe146..c4ae0cd 100644 | |
| --- a/eclipse-temurin_8-windowsservercore-ltsc2022/Dockerfile | |
| +++ b/eclipse-temurin_8-windowsservercore-ltsc2022/Dockerfile | |
| @@ -1,5 +1,5 @@ | |
| # ------------------------------------------------------------------------------ | |
| -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" | |
| +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" | |
| # | |
| # PLEASE DO NOT EDIT IT DIRECTLY. | |
| # ------------------------------------------------------------------------------ | |
| @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 | |
| # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 | |
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |
| -ENV JAVA_VERSION jdk8u422-b05 | |
| +ENV JAVA_VERSION=jdk8u422-b05 | |
| RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ...'); \ | |
| curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ; \ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment