From a5a4244499238c6252d06cfcf3a3df9b44304788 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 13:24:20 +0100 Subject: [PATCH 1/3] build(deps): bump github/codeql-action from 3.25.15 to 3.26.0 (#626) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.15 to 3.26.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/afb54ba388a7dca6ecae48f608c4ff05ff4cc77a...eb055d739abdc2e8de2e5f4ba1a8b246daa779aa) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 345dfe564..42d9b190a 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -45,7 +45,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 + uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -55,7 +55,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 + uses: github/codeql-action/autobuild@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0 # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -68,6 +68,6 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 + uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 4583f125e..bea99dc7d 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -66,6 +66,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 + uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0 with: sarif_file: results.sarif From 1ee39305700483ff4a9c78cc849329c6c08786f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 13:25:09 +0100 Subject: [PATCH 2/3] build(deps): bump actions/upload-artifact from 4.3.5 to 4.3.6 (#625) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.5 to 4.3.6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/89ef406dd8d7e03cfd12d9e0a4a378f454709029...834a144ee995460fba8ed112a2fc961b36a5ec5a) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index bea99dc7d..3688dc46e 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -58,7 +58,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 with: name: SARIF file path: results.sarif From 3af43b469027c0c2241bf6dd066ec93ef2b9ff66 Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 7 Aug 2024 19:55:01 +0100 Subject: [PATCH 3/3] further entrypoint.sh templating improvements (#627) --- 11/jdk/alpine/entrypoint.sh | 5 ----- 11/jdk/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 11/jdk/ubuntu/focal/entrypoint.sh | 5 ----- 11/jdk/ubuntu/jammy/entrypoint.sh | 5 ----- 11/jdk/ubuntu/noble/entrypoint.sh | 5 ----- 11/jre/alpine/entrypoint.sh | 5 ----- 11/jre/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 11/jre/ubuntu/focal/entrypoint.sh | 5 ----- 11/jre/ubuntu/jammy/entrypoint.sh | 5 ----- 11/jre/ubuntu/noble/entrypoint.sh | 5 ----- 17/jdk/alpine/entrypoint.sh | 5 ----- 17/jdk/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 17/jdk/ubuntu/focal/entrypoint.sh | 5 ----- 17/jdk/ubuntu/jammy/entrypoint.sh | 5 ----- 17/jdk/ubuntu/noble/entrypoint.sh | 5 ----- 17/jre/alpine/entrypoint.sh | 5 ----- 17/jre/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 17/jre/ubuntu/focal/entrypoint.sh | 5 ----- 17/jre/ubuntu/jammy/entrypoint.sh | 5 ----- 17/jre/ubuntu/noble/entrypoint.sh | 5 ----- 21/jdk/alpine/entrypoint.sh | 5 ----- 21/jdk/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 21/jdk/ubuntu/jammy/entrypoint.sh | 5 ----- 21/jdk/ubuntu/noble/entrypoint.sh | 5 ----- 21/jre/alpine/entrypoint.sh | 5 ----- 21/jre/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 21/jre/ubuntu/jammy/entrypoint.sh | 5 ----- 21/jre/ubuntu/noble/entrypoint.sh | 5 ----- 22/jdk/alpine/entrypoint.sh | 5 ----- 22/jdk/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 22/jdk/ubuntu/jammy/entrypoint.sh | 5 ----- 22/jdk/ubuntu/noble/entrypoint.sh | 5 ----- 22/jre/alpine/entrypoint.sh | 5 ----- 22/jre/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 22/jre/ubuntu/jammy/entrypoint.sh | 5 ----- 22/jre/ubuntu/noble/entrypoint.sh | 5 ----- 8/jdk/alpine/entrypoint.sh | 6 +----- 8/jdk/ubi/ubi9-minimal/entrypoint.sh | 6 +----- 8/jdk/ubuntu/focal/entrypoint.sh | 6 +----- 8/jdk/ubuntu/jammy/entrypoint.sh | 6 +----- 8/jdk/ubuntu/noble/entrypoint.sh | 6 +----- 8/jre/alpine/entrypoint.sh | 5 ----- 8/jre/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 8/jre/ubuntu/focal/entrypoint.sh | 5 ----- 8/jre/ubuntu/jammy/entrypoint.sh | 5 ----- 8/jre/ubuntu/noble/entrypoint.sh | 5 ----- docker_templates/entrypoint.sh.j2 | 10 +++++----- generate_dockerfiles.py | 2 ++ 48 files changed, 12 insertions(+), 235 deletions(-) diff --git a/11/jdk/alpine/entrypoint.sh b/11/jdk/alpine/entrypoint.sh index c3f02618e..306dd4c34 100755 --- a/11/jdk/alpine/entrypoint.sh +++ b/11/jdk/alpine/entrypoint.sh @@ -28,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 diff --git a/11/jdk/ubi/ubi9-minimal/entrypoint.sh b/11/jdk/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..c00c03280 100755 --- a/11/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/11/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -28,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 diff --git a/11/jdk/ubuntu/focal/entrypoint.sh b/11/jdk/ubuntu/focal/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/11/jdk/ubuntu/focal/entrypoint.sh +++ b/11/jdk/ubuntu/focal/entrypoint.sh @@ -28,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 diff --git a/11/jdk/ubuntu/jammy/entrypoint.sh b/11/jdk/ubuntu/jammy/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/11/jdk/ubuntu/jammy/entrypoint.sh +++ b/11/jdk/ubuntu/jammy/entrypoint.sh @@ -28,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 diff --git a/11/jdk/ubuntu/noble/entrypoint.sh b/11/jdk/ubuntu/noble/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/11/jdk/ubuntu/noble/entrypoint.sh +++ b/11/jdk/ubuntu/noble/entrypoint.sh @@ -28,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 diff --git a/11/jre/alpine/entrypoint.sh b/11/jre/alpine/entrypoint.sh index c3f02618e..306dd4c34 100755 --- a/11/jre/alpine/entrypoint.sh +++ b/11/jre/alpine/entrypoint.sh @@ -28,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 diff --git a/11/jre/ubi/ubi9-minimal/entrypoint.sh b/11/jre/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..c00c03280 100755 --- a/11/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/11/jre/ubi/ubi9-minimal/entrypoint.sh @@ -28,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 diff --git a/11/jre/ubuntu/focal/entrypoint.sh b/11/jre/ubuntu/focal/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/11/jre/ubuntu/focal/entrypoint.sh +++ b/11/jre/ubuntu/focal/entrypoint.sh @@ -28,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 diff --git a/11/jre/ubuntu/jammy/entrypoint.sh b/11/jre/ubuntu/jammy/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/11/jre/ubuntu/jammy/entrypoint.sh +++ b/11/jre/ubuntu/jammy/entrypoint.sh @@ -28,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 diff --git a/11/jre/ubuntu/noble/entrypoint.sh b/11/jre/ubuntu/noble/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/11/jre/ubuntu/noble/entrypoint.sh +++ b/11/jre/ubuntu/noble/entrypoint.sh @@ -28,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 diff --git a/17/jdk/alpine/entrypoint.sh b/17/jdk/alpine/entrypoint.sh index c3f02618e..306dd4c34 100755 --- a/17/jdk/alpine/entrypoint.sh +++ b/17/jdk/alpine/entrypoint.sh @@ -28,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 diff --git a/17/jdk/ubi/ubi9-minimal/entrypoint.sh b/17/jdk/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..c00c03280 100755 --- a/17/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/17/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -28,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 diff --git a/17/jdk/ubuntu/focal/entrypoint.sh b/17/jdk/ubuntu/focal/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/17/jdk/ubuntu/focal/entrypoint.sh +++ b/17/jdk/ubuntu/focal/entrypoint.sh @@ -28,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 diff --git a/17/jdk/ubuntu/jammy/entrypoint.sh b/17/jdk/ubuntu/jammy/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/17/jdk/ubuntu/jammy/entrypoint.sh +++ b/17/jdk/ubuntu/jammy/entrypoint.sh @@ -28,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 diff --git a/17/jdk/ubuntu/noble/entrypoint.sh b/17/jdk/ubuntu/noble/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/17/jdk/ubuntu/noble/entrypoint.sh +++ b/17/jdk/ubuntu/noble/entrypoint.sh @@ -28,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 diff --git a/17/jre/alpine/entrypoint.sh b/17/jre/alpine/entrypoint.sh index c3f02618e..306dd4c34 100755 --- a/17/jre/alpine/entrypoint.sh +++ b/17/jre/alpine/entrypoint.sh @@ -28,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 diff --git a/17/jre/ubi/ubi9-minimal/entrypoint.sh b/17/jre/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..c00c03280 100755 --- a/17/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/17/jre/ubi/ubi9-minimal/entrypoint.sh @@ -28,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 diff --git a/17/jre/ubuntu/focal/entrypoint.sh b/17/jre/ubuntu/focal/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/17/jre/ubuntu/focal/entrypoint.sh +++ b/17/jre/ubuntu/focal/entrypoint.sh @@ -28,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 diff --git a/17/jre/ubuntu/jammy/entrypoint.sh b/17/jre/ubuntu/jammy/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/17/jre/ubuntu/jammy/entrypoint.sh +++ b/17/jre/ubuntu/jammy/entrypoint.sh @@ -28,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 diff --git a/17/jre/ubuntu/noble/entrypoint.sh b/17/jre/ubuntu/noble/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/17/jre/ubuntu/noble/entrypoint.sh +++ b/17/jre/ubuntu/noble/entrypoint.sh @@ -28,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 diff --git a/21/jdk/alpine/entrypoint.sh b/21/jdk/alpine/entrypoint.sh index c3f02618e..306dd4c34 100755 --- a/21/jdk/alpine/entrypoint.sh +++ b/21/jdk/alpine/entrypoint.sh @@ -28,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 diff --git a/21/jdk/ubi/ubi9-minimal/entrypoint.sh b/21/jdk/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..c00c03280 100755 --- a/21/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/21/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -28,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 diff --git a/21/jdk/ubuntu/jammy/entrypoint.sh b/21/jdk/ubuntu/jammy/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/21/jdk/ubuntu/jammy/entrypoint.sh +++ b/21/jdk/ubuntu/jammy/entrypoint.sh @@ -28,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 diff --git a/21/jdk/ubuntu/noble/entrypoint.sh b/21/jdk/ubuntu/noble/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/21/jdk/ubuntu/noble/entrypoint.sh +++ b/21/jdk/ubuntu/noble/entrypoint.sh @@ -28,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 diff --git a/21/jre/alpine/entrypoint.sh b/21/jre/alpine/entrypoint.sh index c3f02618e..306dd4c34 100755 --- a/21/jre/alpine/entrypoint.sh +++ b/21/jre/alpine/entrypoint.sh @@ -28,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 diff --git a/21/jre/ubi/ubi9-minimal/entrypoint.sh b/21/jre/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..c00c03280 100755 --- a/21/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/21/jre/ubi/ubi9-minimal/entrypoint.sh @@ -28,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 diff --git a/21/jre/ubuntu/jammy/entrypoint.sh b/21/jre/ubuntu/jammy/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/21/jre/ubuntu/jammy/entrypoint.sh +++ b/21/jre/ubuntu/jammy/entrypoint.sh @@ -28,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 diff --git a/21/jre/ubuntu/noble/entrypoint.sh b/21/jre/ubuntu/noble/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/21/jre/ubuntu/noble/entrypoint.sh +++ b/21/jre/ubuntu/noble/entrypoint.sh @@ -28,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 diff --git a/22/jdk/alpine/entrypoint.sh b/22/jdk/alpine/entrypoint.sh index c3f02618e..306dd4c34 100755 --- a/22/jdk/alpine/entrypoint.sh +++ b/22/jdk/alpine/entrypoint.sh @@ -28,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 diff --git a/22/jdk/ubi/ubi9-minimal/entrypoint.sh b/22/jdk/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..c00c03280 100755 --- a/22/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/22/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -28,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 diff --git a/22/jdk/ubuntu/jammy/entrypoint.sh b/22/jdk/ubuntu/jammy/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/22/jdk/ubuntu/jammy/entrypoint.sh +++ b/22/jdk/ubuntu/jammy/entrypoint.sh @@ -28,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 diff --git a/22/jdk/ubuntu/noble/entrypoint.sh b/22/jdk/ubuntu/noble/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/22/jdk/ubuntu/noble/entrypoint.sh +++ b/22/jdk/ubuntu/noble/entrypoint.sh @@ -28,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 diff --git a/22/jre/alpine/entrypoint.sh b/22/jre/alpine/entrypoint.sh index c3f02618e..306dd4c34 100755 --- a/22/jre/alpine/entrypoint.sh +++ b/22/jre/alpine/entrypoint.sh @@ -28,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 diff --git a/22/jre/ubi/ubi9-minimal/entrypoint.sh b/22/jre/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..c00c03280 100755 --- a/22/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/22/jre/ubi/ubi9-minimal/entrypoint.sh @@ -28,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 diff --git a/22/jre/ubuntu/jammy/entrypoint.sh b/22/jre/ubuntu/jammy/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/22/jre/ubuntu/jammy/entrypoint.sh +++ b/22/jre/ubuntu/jammy/entrypoint.sh @@ -28,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 diff --git a/22/jre/ubuntu/noble/entrypoint.sh b/22/jre/ubuntu/noble/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/22/jre/ubuntu/noble/entrypoint.sh +++ b/22/jre/ubuntu/noble/entrypoint.sh @@ -28,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 diff --git a/8/jdk/alpine/entrypoint.sh b/8/jdk/alpine/entrypoint.sh index c3f02618e..25253b7d2 100755 --- a/8/jdk/alpine/entrypoint.sh +++ b/8/jdk/alpine/entrypoint.sh @@ -26,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 diff --git a/8/jdk/ubi/ubi9-minimal/entrypoint.sh b/8/jdk/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..9e4443332 100755 --- a/8/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/8/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -26,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 diff --git a/8/jdk/ubuntu/focal/entrypoint.sh b/8/jdk/ubuntu/focal/entrypoint.sh index 2d2040468..129e5cccb 100755 --- a/8/jdk/ubuntu/focal/entrypoint.sh +++ b/8/jdk/ubuntu/focal/entrypoint.sh @@ -26,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 diff --git a/8/jdk/ubuntu/jammy/entrypoint.sh b/8/jdk/ubuntu/jammy/entrypoint.sh index 2d2040468..129e5cccb 100755 --- a/8/jdk/ubuntu/jammy/entrypoint.sh +++ b/8/jdk/ubuntu/jammy/entrypoint.sh @@ -26,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 diff --git a/8/jdk/ubuntu/noble/entrypoint.sh b/8/jdk/ubuntu/noble/entrypoint.sh index 2d2040468..129e5cccb 100755 --- a/8/jdk/ubuntu/noble/entrypoint.sh +++ b/8/jdk/ubuntu/noble/entrypoint.sh @@ -26,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 diff --git a/8/jre/alpine/entrypoint.sh b/8/jre/alpine/entrypoint.sh index c3f02618e..306dd4c34 100755 --- a/8/jre/alpine/entrypoint.sh +++ b/8/jre/alpine/entrypoint.sh @@ -28,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 diff --git a/8/jre/ubi/ubi9-minimal/entrypoint.sh b/8/jre/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..c00c03280 100755 --- a/8/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/8/jre/ubi/ubi9-minimal/entrypoint.sh @@ -28,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 diff --git a/8/jre/ubuntu/focal/entrypoint.sh b/8/jre/ubuntu/focal/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/8/jre/ubuntu/focal/entrypoint.sh +++ b/8/jre/ubuntu/focal/entrypoint.sh @@ -28,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 diff --git a/8/jre/ubuntu/jammy/entrypoint.sh b/8/jre/ubuntu/jammy/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/8/jre/ubuntu/jammy/entrypoint.sh +++ b/8/jre/ubuntu/jammy/entrypoint.sh @@ -28,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 diff --git a/8/jre/ubuntu/noble/entrypoint.sh b/8/jre/ubuntu/noble/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/8/jre/ubuntu/noble/entrypoint.sh +++ b/8/jre/ubuntu/noble/entrypoint.sh @@ -28,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 diff --git a/docker_templates/entrypoint.sh.j2 b/docker_templates/entrypoint.sh.j2 index 4e4baac20..6825f5a9e 100755 --- a/docker_templates/entrypoint.sh.j2 +++ b/docker_templates/entrypoint.sh.j2 @@ -13,12 +13,12 @@ set -e TMPDIR=${TMPDIR:-/tmp} # JDK truststore location -JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts - +{%- if version|int == 8 and image_type == "jdk" %} # 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 +{%- else %} +JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts +{%- endif %} # Opt-in is only activated if the environment variable is set if [ -n "$USE_SYSTEM_CA_CERTS" ]; then diff --git a/generate_dockerfiles.py b/generate_dockerfiles.py index d4007cd1d..280643bed 100644 --- a/generate_dockerfiles.py +++ b/generate_dockerfiles.py @@ -180,7 +180,9 @@ def archHelper(arch, os_name): template_entrypoint = env.get_template(template_entrypoint_file) entrypoint = template_entrypoint.render( + image_type=image_type, os=os_name, + version=version, ) with open(