From 4064490f8334d6ed3f069efd6ddf4b0febfcf318 Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 6 Nov 2024 20:51:06 +0200 Subject: [PATCH] correct location to src.zip (#689) --- 11/jre/alpine/Dockerfile | 2 +- 11/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 11/jre/ubuntu/focal/Dockerfile | 2 +- 11/jre/ubuntu/jammy/Dockerfile | 2 +- 11/jre/ubuntu/noble/Dockerfile | 2 +- 17/jre/alpine/Dockerfile | 2 +- 17/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 17/jre/ubuntu/focal/Dockerfile | 2 +- 17/jre/ubuntu/jammy/Dockerfile | 2 +- 17/jre/ubuntu/noble/Dockerfile | 2 +- 21/jre/alpine/Dockerfile | 2 +- 21/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 21/jre/ubuntu/jammy/Dockerfile | 2 +- 21/jre/ubuntu/noble/Dockerfile | 2 +- 23/jre/alpine/Dockerfile | 2 +- 23/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 23/jre/ubuntu/noble/Dockerfile | 2 +- 8/jdk/alpine/Dockerfile | 2 +- 8/jdk/ubi/ubi9-minimal/Dockerfile | 2 +- 8/jdk/ubuntu/focal/Dockerfile | 2 +- 8/jdk/ubuntu/jammy/Dockerfile | 2 +- 8/jdk/ubuntu/noble/Dockerfile | 2 +- 8/jre/alpine/Dockerfile | 2 +- 8/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 8/jre/ubuntu/focal/Dockerfile | 2 +- 8/jre/ubuntu/jammy/Dockerfile | 2 +- 8/jre/ubuntu/noble/Dockerfile | 2 +- docker_templates/partials/multi-arch-install.j2 | 6 +++++- 28 files changed, 32 insertions(+), 28 deletions(-) diff --git a/11/jre/alpine/Dockerfile b/11/jre/alpine/Dockerfile index 9398260fc..a8774a4fd 100644 --- a/11/jre/alpine/Dockerfile +++ b/11/jre/alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/11/jre/ubi/ubi9-minimal/Dockerfile b/11/jre/ubi/ubi9-minimal/Dockerfile index 5fd8ce586..1c4ad7827 100644 --- a/11/jre/ubi/ubi9-minimal/Dockerfile +++ b/11/jre/ubi/ubi9-minimal/Dockerfile @@ -85,7 +85,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/11/jre/ubuntu/focal/Dockerfile b/11/jre/ubuntu/focal/Dockerfile index 591dc3e41..0524cc7ef 100644 --- a/11/jre/ubuntu/focal/Dockerfile +++ b/11/jre/ubuntu/focal/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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 b/11/jre/ubuntu/jammy/Dockerfile index 1a514d32a..3fcf0ae96 100644 --- a/11/jre/ubuntu/jammy/Dockerfile +++ b/11/jre/ubuntu/jammy/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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/noble/Dockerfile b/11/jre/ubuntu/noble/Dockerfile index 414183477..280013985 100644 --- a/11/jre/ubuntu/noble/Dockerfile +++ b/11/jre/ubuntu/noble/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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 b/17/jre/alpine/Dockerfile index 465b093d9..129e4cb7e 100644 --- a/17/jre/alpine/Dockerfile +++ b/17/jre/alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/17/jre/ubi/ubi9-minimal/Dockerfile b/17/jre/ubi/ubi9-minimal/Dockerfile index bb9e3509c..4c93b324d 100644 --- a/17/jre/ubi/ubi9-minimal/Dockerfile +++ b/17/jre/ubi/ubi9-minimal/Dockerfile @@ -85,7 +85,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/17/jre/ubuntu/focal/Dockerfile b/17/jre/ubuntu/focal/Dockerfile index 322ce773c..65e421927 100644 --- a/17/jre/ubuntu/focal/Dockerfile +++ b/17/jre/ubuntu/focal/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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 b/17/jre/ubuntu/jammy/Dockerfile index 0055dfcc1..68f5a8a59 100644 --- a/17/jre/ubuntu/jammy/Dockerfile +++ b/17/jre/ubuntu/jammy/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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/noble/Dockerfile b/17/jre/ubuntu/noble/Dockerfile index 977cf0bf7..c763d397c 100644 --- a/17/jre/ubuntu/noble/Dockerfile +++ b/17/jre/ubuntu/noble/Dockerfile @@ -97,7 +97,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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/21/jre/alpine/Dockerfile b/21/jre/alpine/Dockerfile index 9763d29b9..b971686ba 100644 --- a/21/jre/alpine/Dockerfile +++ b/21/jre/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/21/jre/ubi/ubi9-minimal/Dockerfile b/21/jre/ubi/ubi9-minimal/Dockerfile index 01068de3f..4fc7f89fc 100644 --- a/21/jre/ubi/ubi9-minimal/Dockerfile +++ b/21/jre/ubi/ubi9-minimal/Dockerfile @@ -85,7 +85,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/21/jre/ubuntu/jammy/Dockerfile b/21/jre/ubuntu/jammy/Dockerfile index cf01dd56d..31e385528 100644 --- a/21/jre/ubuntu/jammy/Dockerfile +++ b/21/jre/ubuntu/jammy/Dockerfile @@ -89,7 +89,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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/21/jre/ubuntu/noble/Dockerfile b/21/jre/ubuntu/noble/Dockerfile index b01e42132..976b7ad18 100644 --- a/21/jre/ubuntu/noble/Dockerfile +++ b/21/jre/ubuntu/noble/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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/23/jre/alpine/Dockerfile b/23/jre/alpine/Dockerfile index dd7efa200..060535480 100644 --- a/23/jre/alpine/Dockerfile +++ b/23/jre/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/23/jre/ubi/ubi9-minimal/Dockerfile b/23/jre/ubi/ubi9-minimal/Dockerfile index 6db93a6f8..959c84b5a 100644 --- a/23/jre/ubi/ubi9-minimal/Dockerfile +++ b/23/jre/ubi/ubi9-minimal/Dockerfile @@ -85,7 +85,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/23/jre/ubuntu/noble/Dockerfile b/23/jre/ubuntu/noble/Dockerfile index 8560b8a99..e249ce7be 100644 --- a/23/jre/ubuntu/noble/Dockerfile +++ b/23/jre/ubuntu/noble/Dockerfile @@ -91,7 +91,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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 b/8/jdk/alpine/Dockerfile index c9212d0b3..447e906fd 100644 --- a/8/jdk/alpine/Dockerfile +++ b/8/jdk/alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/8/jdk/ubi/ubi9-minimal/Dockerfile b/8/jdk/ubi/ubi9-minimal/Dockerfile index 10b02bc6b..1f6e208d4 100644 --- a/8/jdk/ubi/ubi9-minimal/Dockerfile +++ b/8/jdk/ubi/ubi9-minimal/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/8/jdk/ubuntu/focal/Dockerfile b/8/jdk/ubuntu/focal/Dockerfile index 3cb62c438..6cd94b952 100644 --- a/8/jdk/ubuntu/focal/Dockerfile +++ b/8/jdk/ubuntu/focal/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/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 b/8/jdk/ubuntu/jammy/Dockerfile index 523b962fa..b7652c8ba 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile +++ b/8/jdk/ubuntu/jammy/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/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/noble/Dockerfile b/8/jdk/ubuntu/noble/Dockerfile index be69abe63..83ee65e7b 100644 --- a/8/jdk/ubuntu/noble/Dockerfile +++ b/8/jdk/ubuntu/noble/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/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 b/8/jre/alpine/Dockerfile index 8b84faf65..a8d730f97 100644 --- a/8/jre/alpine/Dockerfile +++ b/8/jre/alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/8/jre/ubi/ubi9-minimal/Dockerfile b/8/jre/ubi/ubi9-minimal/Dockerfile index a3c49cca9..8a9e887e7 100644 --- a/8/jre/ubi/ubi9-minimal/Dockerfile +++ b/8/jre/ubi/ubi9-minimal/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + rm -f /tmp/openjdk.tar.gz; RUN set -eux; \ echo "Verifying install ..."; \ diff --git a/8/jre/ubuntu/focal/Dockerfile b/8/jre/ubuntu/focal/Dockerfile index 12170174c..342588223 100644 --- a/8/jre/ubuntu/focal/Dockerfile +++ b/8/jre/ubuntu/focal/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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 b/8/jre/ubuntu/jammy/Dockerfile index f4511fc67..ffc2e29a3 100644 --- a/8/jre/ubuntu/jammy/Dockerfile +++ b/8/jre/ubuntu/jammy/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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/noble/Dockerfile b/8/jre/ubuntu/noble/Dockerfile index 749c34f08..ca8722ad2 100644 --- a/8/jre/ubuntu/noble/Dockerfile +++ b/8/jre/ubuntu/noble/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ + rm -f /tmp/openjdk.tar.gz; \ # 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/docker_templates/partials/multi-arch-install.j2 b/docker_templates/partials/multi-arch-install.j2 index f9c36796b..b3cd8692c 100644 --- a/docker_templates/partials/multi-arch-install.j2 +++ b/docker_templates/partials/multi-arch-install.j2 @@ -33,4 +33,8 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; + {%- if version|int == 8 %} + rm -f /tmp/openjdk.tar.gz{% if image_type == "jdk" %} ${JAVA_HOME}/src.zip{% endif %}; + {%- else %} + rm -f /tmp/openjdk.tar.gz{% if image_type == "jdk" %} ${JAVA_HOME}/lib/src.zip{% endif %}; + {%- endif %}