From 61e6092e54539710142ab64c1c92c73f296dc356 Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Wed, 31 May 2023 14:40:08 +0200 Subject: [PATCH] Fix: correct path of src.zip to be removed from image (#396) * build(deps): bump actions/checkout from 3.2.0 to 3.3.0 (#3) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/755da8c3cf115ac066823e79a1e1788f8940201b...ac593985615ec2ede58e132d2e21d2b1cbd6127c) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump docker-library/bashbrew from 0.1.7 to 0.1.8 (#4) Bumps [docker-library/bashbrew](https://github.com/docker-library/bashbrew) from 0.1.7 to 0.1.8. - [Release notes](https://github.com/docker-library/bashbrew/releases) - [Changelog](https://github.com/docker-library/bashbrew/blob/master/Dockerfile.release) - [Commits](https://github.com/docker-library/bashbrew/compare/026ccf128d6c4fcc5c92e4db218095faa2453cee...7e160dca3123caecf32c33ba31821dd2aa3716cd) --- updated-dependencies: - dependency-name: docker-library/bashbrew 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> * build(deps): bump actions/checkout from 3.3.0 to 3.4.0 (#5) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/ac593985615ec2ede58e132d2e21d2b1cbd6127c...24cb9080177205b6e8c946b17badbe402adc938f) --- updated-dependencies: - dependency-name: actions/checkout 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> * build(deps): bump actions/checkout from 3.4.0 to 3.5.0 (#6) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/24cb9080177205b6e8c946b17badbe402adc938f...8f4b7f84864484a7bf31766abe9204da3cbe65b3) --- updated-dependencies: - dependency-name: actions/checkout 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> * build(deps): bump actions/checkout from 3.5.0 to 3.5.1 (#7) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/8f4b7f84864484a7bf31766abe9204da3cbe65b3...83b7061638ee4956cf7545a6f7efe594e5ad0247) --- updated-dependencies: - dependency-name: actions/checkout 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> * build(deps): bump actions/checkout from 3.5.1 to 3.5.2 (#8) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/83b7061638ee4956cf7545a6f7efe594e5ad0247...8e5e7e5ab8b370d6c329ec480221332ada57f0ab) --- updated-dependencies: - dependency-name: actions/checkout 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> * fix: wrong path for src.zip to be removed --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 11/jdk/alpine/Dockerfile.releases.full | 2 +- 11/jdk/centos/Dockerfile.releases.full | 2 +- 11/jdk/ubi/ubi9-minimal/Dockerfile.releases.full | 2 +- 11/jdk/ubuntu/focal/Dockerfile.releases.full | 2 +- 11/jdk/ubuntu/jammy/Dockerfile.releases.full | 2 +- 11/jre/alpine/Dockerfile.releases.full | 2 +- 11/jre/centos/Dockerfile.releases.full | 2 +- 11/jre/ubi/ubi9-minimal/Dockerfile.releases.full | 2 +- 11/jre/ubuntu/focal/Dockerfile.releases.full | 2 +- 11/jre/ubuntu/jammy/Dockerfile.releases.full | 2 +- 17/jdk/alpine/Dockerfile.releases.full | 2 +- 17/jdk/centos/Dockerfile.releases.full | 2 +- 17/jdk/ubi/ubi9-minimal/Dockerfile.releases.full | 2 +- 17/jdk/ubuntu/focal/Dockerfile.releases.full | 2 +- 17/jdk/ubuntu/jammy/Dockerfile.releases.full | 2 +- 17/jre/alpine/Dockerfile.releases.full | 2 +- 17/jre/centos/Dockerfile.releases.full | 2 +- 17/jre/ubi/ubi9-minimal/Dockerfile.releases.full | 2 +- 17/jre/ubuntu/focal/Dockerfile.releases.full | 2 +- 17/jre/ubuntu/jammy/Dockerfile.releases.full | 2 +- 18/jdk/alpine/Dockerfile.releases.full | 2 +- 18/jdk/centos/Dockerfile.releases.full | 2 +- 18/jdk/ubuntu/focal/Dockerfile.releases.full | 2 +- 18/jdk/ubuntu/jammy/Dockerfile.releases.full | 2 +- 18/jre/alpine/Dockerfile.releases.full | 2 +- 18/jre/centos/Dockerfile.releases.full | 2 +- 18/jre/ubuntu/focal/Dockerfile.releases.full | 2 +- 18/jre/ubuntu/jammy/Dockerfile.releases.full | 2 +- 19/jdk/alpine/Dockerfile.releases.full | 2 +- 19/jdk/centos/Dockerfile.releases.full | 2 +- 19/jdk/ubi/ubi9-minimal/Dockerfile.releases.full | 2 +- 19/jdk/ubuntu/focal/Dockerfile.releases.full | 2 +- 19/jdk/ubuntu/jammy/Dockerfile.releases.full | 2 +- 19/jre/alpine/Dockerfile.releases.full | 2 +- 19/jre/centos/Dockerfile.releases.full | 2 +- 19/jre/ubi/ubi9-minimal/Dockerfile.releases.full | 2 +- 19/jre/ubuntu/focal/Dockerfile.releases.full | 2 +- 19/jre/ubuntu/jammy/Dockerfile.releases.full | 2 +- 20/jdk/alpine/Dockerfile.releases.full | 2 +- 20/jdk/ubi/ubi9-minimal/Dockerfile.releases.full | 2 +- 20/jdk/ubuntu/jammy/Dockerfile.releases.full | 2 +- 20/jre/alpine/Dockerfile.releases.full | 2 +- 20/jre/ubi/ubi9-minimal/Dockerfile.releases.full | 2 +- 20/jre/ubuntu/jammy/Dockerfile.releases.full | 2 +- 8/jdk/alpine/Dockerfile.releases.full | 2 +- 8/jdk/centos/Dockerfile.releases.full | 2 +- 8/jdk/ubi/ubi9-minimal/Dockerfile.releases.full | 2 +- 8/jdk/ubuntu/focal/Dockerfile.releases.full | 2 +- 8/jdk/ubuntu/jammy/Dockerfile.releases.full | 2 +- 8/jre/alpine/Dockerfile.releases.full | 2 +- 8/jre/centos/Dockerfile.releases.full | 2 +- 8/jre/ubi/ubi9-minimal/Dockerfile.releases.full | 2 +- 8/jre/ubuntu/focal/Dockerfile.releases.full | 2 +- 8/jre/ubuntu/jammy/Dockerfile.releases.full | 2 +- dockerfile_functions.sh | 4 ++-- 55 files changed, 56 insertions(+), 56 deletions(-) diff --git a/11/jdk/alpine/Dockerfile.releases.full b/11/jdk/alpine/Dockerfile.releases.full index e9176e568..fc3abdd4b 100644 --- a/11/jdk/alpine/Dockerfile.releases.full +++ b/11/jdk/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/11/jdk/centos/Dockerfile.releases.full b/11/jdk/centos/Dockerfile.releases.full index 8dc0bedce..0964f7e99 100644 --- a/11/jdk/centos/Dockerfile.releases.full +++ b/11/jdk/centos/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/11/jdk/ubi/ubi9-minimal/Dockerfile.releases.full b/11/jdk/ubi/ubi9-minimal/Dockerfile.releases.full index 1f7004e3f..41125507e 100644 --- a/11/jdk/ubi/ubi9-minimal/Dockerfile.releases.full +++ b/11/jdk/ubi/ubi9-minimal/Dockerfile.releases.full @@ -63,7 +63,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/11/jdk/ubuntu/focal/Dockerfile.releases.full b/11/jdk/ubuntu/focal/Dockerfile.releases.full index 74a1183d8..0f4123d85 100644 --- a/11/jdk/ubuntu/focal/Dockerfile.releases.full +++ b/11/jdk/ubuntu/focal/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/11/jdk/ubuntu/jammy/Dockerfile.releases.full b/11/jdk/ubuntu/jammy/Dockerfile.releases.full index 6d94bef09..fd889bdf7 100644 --- a/11/jdk/ubuntu/jammy/Dockerfile.releases.full +++ b/11/jdk/ubuntu/jammy/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/11/jre/alpine/Dockerfile.releases.full b/11/jre/alpine/Dockerfile.releases.full index 54d039c0a..c6e7a23e2 100644 --- a/11/jre/alpine/Dockerfile.releases.full +++ b/11/jre/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/11/jre/centos/Dockerfile.releases.full b/11/jre/centos/Dockerfile.releases.full index 7e883678a..4e4aaae97 100644 --- a/11/jre/centos/Dockerfile.releases.full +++ b/11/jre/centos/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/11/jre/ubi/ubi9-minimal/Dockerfile.releases.full b/11/jre/ubi/ubi9-minimal/Dockerfile.releases.full index 7126ef52d..ee63a8fd6 100644 --- a/11/jre/ubi/ubi9-minimal/Dockerfile.releases.full +++ b/11/jre/ubi/ubi9-minimal/Dockerfile.releases.full @@ -63,7 +63,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/11/jre/ubuntu/focal/Dockerfile.releases.full b/11/jre/ubuntu/focal/Dockerfile.releases.full index 350b5325c..1a9e66f65 100644 --- a/11/jre/ubuntu/focal/Dockerfile.releases.full +++ b/11/jre/ubuntu/focal/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/11/jre/ubuntu/jammy/Dockerfile.releases.full b/11/jre/ubuntu/jammy/Dockerfile.releases.full index e2c4b53cb..eadf7e299 100644 --- a/11/jre/ubuntu/jammy/Dockerfile.releases.full +++ b/11/jre/ubuntu/jammy/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/17/jdk/alpine/Dockerfile.releases.full b/17/jdk/alpine/Dockerfile.releases.full index 50ee42006..698534c34 100644 --- a/17/jdk/alpine/Dockerfile.releases.full +++ b/17/jdk/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/17/jdk/centos/Dockerfile.releases.full b/17/jdk/centos/Dockerfile.releases.full index 4d933edfb..a6b49b23d 100644 --- a/17/jdk/centos/Dockerfile.releases.full +++ b/17/jdk/centos/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/17/jdk/ubi/ubi9-minimal/Dockerfile.releases.full b/17/jdk/ubi/ubi9-minimal/Dockerfile.releases.full index 464dff152..dfa4b3d75 100644 --- a/17/jdk/ubi/ubi9-minimal/Dockerfile.releases.full +++ b/17/jdk/ubi/ubi9-minimal/Dockerfile.releases.full @@ -63,7 +63,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/17/jdk/ubuntu/focal/Dockerfile.releases.full b/17/jdk/ubuntu/focal/Dockerfile.releases.full index 1ccde6cfe..ce6108cec 100644 --- a/17/jdk/ubuntu/focal/Dockerfile.releases.full +++ b/17/jdk/ubuntu/focal/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/17/jdk/ubuntu/jammy/Dockerfile.releases.full b/17/jdk/ubuntu/jammy/Dockerfile.releases.full index 14ad50ae2..bde79aeae 100644 --- a/17/jdk/ubuntu/jammy/Dockerfile.releases.full +++ b/17/jdk/ubuntu/jammy/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/17/jre/alpine/Dockerfile.releases.full b/17/jre/alpine/Dockerfile.releases.full index a91ab0b86..1e414ea2b 100644 --- a/17/jre/alpine/Dockerfile.releases.full +++ b/17/jre/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/17/jre/centos/Dockerfile.releases.full b/17/jre/centos/Dockerfile.releases.full index 96943e844..3c6910cf4 100644 --- a/17/jre/centos/Dockerfile.releases.full +++ b/17/jre/centos/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/17/jre/ubi/ubi9-minimal/Dockerfile.releases.full b/17/jre/ubi/ubi9-minimal/Dockerfile.releases.full index b78544aa0..364d0eef6 100644 --- a/17/jre/ubi/ubi9-minimal/Dockerfile.releases.full +++ b/17/jre/ubi/ubi9-minimal/Dockerfile.releases.full @@ -63,7 +63,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/17/jre/ubuntu/focal/Dockerfile.releases.full b/17/jre/ubuntu/focal/Dockerfile.releases.full index 9e165410a..2a49eaa6d 100644 --- a/17/jre/ubuntu/focal/Dockerfile.releases.full +++ b/17/jre/ubuntu/focal/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/17/jre/ubuntu/jammy/Dockerfile.releases.full b/17/jre/ubuntu/jammy/Dockerfile.releases.full index a3ed96af2..e1a69aeba 100644 --- a/17/jre/ubuntu/jammy/Dockerfile.releases.full +++ b/17/jre/ubuntu/jammy/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/18/jdk/alpine/Dockerfile.releases.full b/18/jdk/alpine/Dockerfile.releases.full index e9d5091a7..24229a01e 100644 --- a/18/jdk/alpine/Dockerfile.releases.full +++ b/18/jdk/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/18/jdk/centos/Dockerfile.releases.full b/18/jdk/centos/Dockerfile.releases.full index 148136ac9..9c9e52f79 100644 --- a/18/jdk/centos/Dockerfile.releases.full +++ b/18/jdk/centos/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/18/jdk/ubuntu/focal/Dockerfile.releases.full b/18/jdk/ubuntu/focal/Dockerfile.releases.full index 2f1b9d43f..904f76ce8 100644 --- a/18/jdk/ubuntu/focal/Dockerfile.releases.full +++ b/18/jdk/ubuntu/focal/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/18/jdk/ubuntu/jammy/Dockerfile.releases.full b/18/jdk/ubuntu/jammy/Dockerfile.releases.full index b911bc02d..5035c60fa 100644 --- a/18/jdk/ubuntu/jammy/Dockerfile.releases.full +++ b/18/jdk/ubuntu/jammy/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/18/jre/alpine/Dockerfile.releases.full b/18/jre/alpine/Dockerfile.releases.full index 8686606be..eb3575744 100644 --- a/18/jre/alpine/Dockerfile.releases.full +++ b/18/jre/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/18/jre/centos/Dockerfile.releases.full b/18/jre/centos/Dockerfile.releases.full index b6fdddd62..914e2f108 100644 --- a/18/jre/centos/Dockerfile.releases.full +++ b/18/jre/centos/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/18/jre/ubuntu/focal/Dockerfile.releases.full b/18/jre/ubuntu/focal/Dockerfile.releases.full index 107b8c87e..516fa6f15 100644 --- a/18/jre/ubuntu/focal/Dockerfile.releases.full +++ b/18/jre/ubuntu/focal/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/18/jre/ubuntu/jammy/Dockerfile.releases.full b/18/jre/ubuntu/jammy/Dockerfile.releases.full index e95fd0d98..2f822f331 100644 --- a/18/jre/ubuntu/jammy/Dockerfile.releases.full +++ b/18/jre/ubuntu/jammy/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/19/jdk/alpine/Dockerfile.releases.full b/19/jdk/alpine/Dockerfile.releases.full index 14c20d6c5..056702675 100644 --- a/19/jdk/alpine/Dockerfile.releases.full +++ b/19/jdk/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/19/jdk/centos/Dockerfile.releases.full b/19/jdk/centos/Dockerfile.releases.full index f45498c10..4eaf0f1a8 100644 --- a/19/jdk/centos/Dockerfile.releases.full +++ b/19/jdk/centos/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/19/jdk/ubi/ubi9-minimal/Dockerfile.releases.full b/19/jdk/ubi/ubi9-minimal/Dockerfile.releases.full index b31818cdc..f36fcecf3 100644 --- a/19/jdk/ubi/ubi9-minimal/Dockerfile.releases.full +++ b/19/jdk/ubi/ubi9-minimal/Dockerfile.releases.full @@ -63,7 +63,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/19/jdk/ubuntu/focal/Dockerfile.releases.full b/19/jdk/ubuntu/focal/Dockerfile.releases.full index de76d4608..370ebabb8 100644 --- a/19/jdk/ubuntu/focal/Dockerfile.releases.full +++ b/19/jdk/ubuntu/focal/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/19/jdk/ubuntu/jammy/Dockerfile.releases.full b/19/jdk/ubuntu/jammy/Dockerfile.releases.full index 094203434..3af37d031 100644 --- a/19/jdk/ubuntu/jammy/Dockerfile.releases.full +++ b/19/jdk/ubuntu/jammy/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/19/jre/alpine/Dockerfile.releases.full b/19/jre/alpine/Dockerfile.releases.full index 8bb1325ad..f20677f65 100644 --- a/19/jre/alpine/Dockerfile.releases.full +++ b/19/jre/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/19/jre/centos/Dockerfile.releases.full b/19/jre/centos/Dockerfile.releases.full index f29632068..1d940f7a8 100644 --- a/19/jre/centos/Dockerfile.releases.full +++ b/19/jre/centos/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/19/jre/ubi/ubi9-minimal/Dockerfile.releases.full b/19/jre/ubi/ubi9-minimal/Dockerfile.releases.full index e52fdf671..73e29e600 100644 --- a/19/jre/ubi/ubi9-minimal/Dockerfile.releases.full +++ b/19/jre/ubi/ubi9-minimal/Dockerfile.releases.full @@ -63,7 +63,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/19/jre/ubuntu/focal/Dockerfile.releases.full b/19/jre/ubuntu/focal/Dockerfile.releases.full index dec48fac4..0b50fb8ce 100644 --- a/19/jre/ubuntu/focal/Dockerfile.releases.full +++ b/19/jre/ubuntu/focal/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/19/jre/ubuntu/jammy/Dockerfile.releases.full b/19/jre/ubuntu/jammy/Dockerfile.releases.full index 497ca4dcf..18d18a652 100644 --- a/19/jre/ubuntu/jammy/Dockerfile.releases.full +++ b/19/jre/ubuntu/jammy/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/20/jdk/alpine/Dockerfile.releases.full b/20/jdk/alpine/Dockerfile.releases.full index b144b5048..243b32355 100644 --- a/20/jdk/alpine/Dockerfile.releases.full +++ b/20/jdk/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/20/jdk/ubi/ubi9-minimal/Dockerfile.releases.full b/20/jdk/ubi/ubi9-minimal/Dockerfile.releases.full index 5d5efe1c3..0e585ace0 100644 --- a/20/jdk/ubi/ubi9-minimal/Dockerfile.releases.full +++ b/20/jdk/ubi/ubi9-minimal/Dockerfile.releases.full @@ -55,7 +55,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/20/jdk/ubuntu/jammy/Dockerfile.releases.full b/20/jdk/ubuntu/jammy/Dockerfile.releases.full index 75313ba9d..ede60b851 100644 --- a/20/jdk/ubuntu/jammy/Dockerfile.releases.full +++ b/20/jdk/ubuntu/jammy/Dockerfile.releases.full @@ -58,7 +58,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/20/jre/alpine/Dockerfile.releases.full b/20/jre/alpine/Dockerfile.releases.full index 0e3590d94..dd4de3346 100644 --- a/20/jre/alpine/Dockerfile.releases.full +++ b/20/jre/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/20/jre/ubi/ubi9-minimal/Dockerfile.releases.full b/20/jre/ubi/ubi9-minimal/Dockerfile.releases.full index 3b9538f04..1877aadcc 100644 --- a/20/jre/ubi/ubi9-minimal/Dockerfile.releases.full +++ b/20/jre/ubi/ubi9-minimal/Dockerfile.releases.full @@ -55,7 +55,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ diff --git a/20/jre/ubuntu/jammy/Dockerfile.releases.full b/20/jre/ubuntu/jammy/Dockerfile.releases.full index 13877af7e..8e18fda94 100644 --- a/20/jre/ubuntu/jammy/Dockerfile.releases.full +++ b/20/jre/ubuntu/jammy/Dockerfile.releases.full @@ -58,7 +58,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ diff --git a/8/jdk/alpine/Dockerfile.releases.full b/8/jdk/alpine/Dockerfile.releases.full index 4658d2c7e..feeb69f04 100644 --- a/8/jdk/alpine/Dockerfile.releases.full +++ b/8/jdk/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && echo javac -version && javac -version \ diff --git a/8/jdk/centos/Dockerfile.releases.full b/8/jdk/centos/Dockerfile.releases.full index 978847f27..c64fb26ac 100644 --- a/8/jdk/centos/Dockerfile.releases.full +++ b/8/jdk/centos/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && echo javac -version && javac -version \ diff --git a/8/jdk/ubi/ubi9-minimal/Dockerfile.releases.full b/8/jdk/ubi/ubi9-minimal/Dockerfile.releases.full index 4a1abb6fc..fef964f00 100644 --- a/8/jdk/ubi/ubi9-minimal/Dockerfile.releases.full +++ b/8/jdk/ubi/ubi9-minimal/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && echo javac -version && javac -version \ diff --git a/8/jdk/ubuntu/focal/Dockerfile.releases.full b/8/jdk/ubuntu/focal/Dockerfile.releases.full index 5c85578c6..3e2b6ff53 100644 --- a/8/jdk/ubuntu/focal/Dockerfile.releases.full +++ b/8/jdk/ubuntu/focal/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; diff --git a/8/jdk/ubuntu/jammy/Dockerfile.releases.full b/8/jdk/ubuntu/jammy/Dockerfile.releases.full index 700b54659..0ae226f47 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile.releases.full +++ b/8/jdk/ubuntu/jammy/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; diff --git a/8/jre/alpine/Dockerfile.releases.full b/8/jre/alpine/Dockerfile.releases.full index 6fd4073d8..d35c83242 100644 --- a/8/jre/alpine/Dockerfile.releases.full +++ b/8/jre/alpine/Dockerfile.releases.full @@ -52,7 +52,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && echo java -version && java -version \ diff --git a/8/jre/centos/Dockerfile.releases.full b/8/jre/centos/Dockerfile.releases.full index 87eb02085..e2a48af97 100644 --- a/8/jre/centos/Dockerfile.releases.full +++ b/8/jre/centos/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && echo java -version && java -version \ diff --git a/8/jre/ubi/ubi9-minimal/Dockerfile.releases.full b/8/jre/ubi/ubi9-minimal/Dockerfile.releases.full index 4eef706f1..c26e79d4a 100644 --- a/8/jre/ubi/ubi9-minimal/Dockerfile.releases.full +++ b/8/jre/ubi/ubi9-minimal/Dockerfile.releases.full @@ -59,7 +59,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN echo Verifying install ... \ && echo java -version && java -version \ diff --git a/8/jre/ubuntu/focal/Dockerfile.releases.full b/8/jre/ubuntu/focal/Dockerfile.releases.full index 248dd63df..eb8d4365f 100644 --- a/8/jre/ubuntu/focal/Dockerfile.releases.full +++ b/8/jre/ubuntu/focal/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; diff --git a/8/jre/ubuntu/jammy/Dockerfile.releases.full b/8/jre/ubuntu/jammy/Dockerfile.releases.full index 8d81b6b05..ccf93a70d 100644 --- a/8/jre/ubuntu/jammy/Dockerfile.releases.full +++ b/8/jre/ubuntu/jammy/Dockerfile.releases.full @@ -70,7 +70,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; diff --git a/dockerfile_functions.sh b/dockerfile_functions.sh index 7f877969c..3c5a46ed1 100755 --- a/dockerfile_functions.sh +++ b/dockerfile_functions.sh @@ -436,14 +436,14 @@ EOI print_java_install_post() { cat >> "$1" <<-EOI - rm -f /tmp/openjdk.tar.gz \${JAVA_HOME}/src.zip; + rm -f /tmp/openjdk.tar.gz \${JAVA_HOME}/lib/src.zip; EOI } print_ubuntu_java_install_post() { above_8="^(9|[1-9][0-9]+)$" cat >> "$1" <<-EOI - rm -f /tmp/openjdk.tar.gz \${JAVA_HOME}/src.zip; \\ + rm -f /tmp/openjdk.tar.gz \${JAVA_HOME}/lib/src.zip; \\ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 find "\$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \\ EOI