From 730d808e13f8bc208e731168c8c6cd6ab929fe8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 13:41:05 +0000 Subject: [PATCH 1/2] Bump fedora from 36 to 40 in /linux/jre/redhat/src/main/packaging Bumps fedora from 36 to 40. --- updated-dependencies: - dependency-name: fedora dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- linux/jre/redhat/src/main/packaging/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/jre/redhat/src/main/packaging/Dockerfile b/linux/jre/redhat/src/main/packaging/Dockerfile index 5066c643e..2daeb3c3d 100644 --- a/linux/jre/redhat/src/main/packaging/Dockerfile +++ b/linux/jre/redhat/src/main/packaging/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:36 +FROM fedora:40 RUN dnf update -y && dnf install -y rpmdevtools \ rpm-sign \ From d38fad378fb47f8ae0d45bd3cbca478840f6fb76 Mon Sep 17 00:00:00 2001 From: George Adams Date: Tue, 30 Apr 2024 09:25:25 +0100 Subject: [PATCH 2/2] gosu updates --- linux/jdk/redhat/src/main/packaging/Dockerfile | 14 ++++---------- linux/jdk/suse/src/main/packaging/Dockerfile | 12 +++--------- linux/jre/redhat/src/main/packaging/Dockerfile | 12 +++--------- linux/jre/suse/src/main/packaging/Dockerfile | 12 +++--------- 4 files changed, 13 insertions(+), 37 deletions(-) diff --git a/linux/jdk/redhat/src/main/packaging/Dockerfile b/linux/jdk/redhat/src/main/packaging/Dockerfile index 5066c643e..816fbaa46 100644 --- a/linux/jdk/redhat/src/main/packaging/Dockerfile +++ b/linux/jdk/redhat/src/main/packaging/Dockerfile @@ -1,21 +1,15 @@ -FROM fedora:36 +FROM fedora:40 RUN dnf update -y && dnf install -y rpmdevtools \ rpm-sign \ rpmlint \ - gnupg2 \ - wget \ tar \ dpkg \ findutils \ - tini + tini \ + wget -RUN wget --progress=dot:mega -O /usr/bin/gosu https://github.com/tianon/gosu/releases/download/1.14/gosu-"$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget --progress=dot:mega -O /tmp/gosu.asc https://github.com/tianon/gosu/releases/download/1.14/gosu-"$(dpkg --print-architecture | awk -F- '{ print $NF }')".asc \ - && gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc /usr/bin/gosu \ - && chmod +x /usr/bin/gosu \ - && rm -f /tmp/gosu.asc +COPY --from=tianon/gosu /gosu /usr/local/bin/ # Create unprivileged user for building, see # https://github.com/hexops/dockerfile#use-a-static-uid-and-gid diff --git a/linux/jdk/suse/src/main/packaging/Dockerfile b/linux/jdk/suse/src/main/packaging/Dockerfile index 9b886499f..4c9a32e62 100644 --- a/linux/jdk/suse/src/main/packaging/Dockerfile +++ b/linux/jdk/suse/src/main/packaging/Dockerfile @@ -4,20 +4,14 @@ RUN zypper update -y && zypper install -y rpm-build \ rpm-devel \ rpmdevtools \ rpmlint \ - gpg2 \ dirmngr \ - wget \ tar \ dpkg \ findutils \ - tini + tini \ + wget -RUN wget --progress=dot:mega -O /usr/bin/gosu https://github.com/tianon/gosu/releases/download/1.14/gosu-"$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget --progress=dot:mega -O /tmp/gosu.asc https://github.com/tianon/gosu/releases/download/1.14/gosu-"$(dpkg --print-architecture | awk -F- '{ print $NF }')".asc \ - && gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc /usr/bin/gosu \ - && chmod +x /usr/bin/gosu \ - && rm -f /tmp/gosu.asc +COPY --from=tianon/gosu /gosu /usr/local/bin/ # Create unprivileged user for building, see # https://github.com/hexops/dockerfile#use-a-static-uid-and-gid diff --git a/linux/jre/redhat/src/main/packaging/Dockerfile b/linux/jre/redhat/src/main/packaging/Dockerfile index 2daeb3c3d..816fbaa46 100644 --- a/linux/jre/redhat/src/main/packaging/Dockerfile +++ b/linux/jre/redhat/src/main/packaging/Dockerfile @@ -3,19 +3,13 @@ FROM fedora:40 RUN dnf update -y && dnf install -y rpmdevtools \ rpm-sign \ rpmlint \ - gnupg2 \ - wget \ tar \ dpkg \ findutils \ - tini + tini \ + wget -RUN wget --progress=dot:mega -O /usr/bin/gosu https://github.com/tianon/gosu/releases/download/1.14/gosu-"$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget --progress=dot:mega -O /tmp/gosu.asc https://github.com/tianon/gosu/releases/download/1.14/gosu-"$(dpkg --print-architecture | awk -F- '{ print $NF }')".asc \ - && gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc /usr/bin/gosu \ - && chmod +x /usr/bin/gosu \ - && rm -f /tmp/gosu.asc +COPY --from=tianon/gosu /gosu /usr/local/bin/ # Create unprivileged user for building, see # https://github.com/hexops/dockerfile#use-a-static-uid-and-gid diff --git a/linux/jre/suse/src/main/packaging/Dockerfile b/linux/jre/suse/src/main/packaging/Dockerfile index 9b886499f..4c9a32e62 100644 --- a/linux/jre/suse/src/main/packaging/Dockerfile +++ b/linux/jre/suse/src/main/packaging/Dockerfile @@ -4,20 +4,14 @@ RUN zypper update -y && zypper install -y rpm-build \ rpm-devel \ rpmdevtools \ rpmlint \ - gpg2 \ dirmngr \ - wget \ tar \ dpkg \ findutils \ - tini + tini \ + wget -RUN wget --progress=dot:mega -O /usr/bin/gosu https://github.com/tianon/gosu/releases/download/1.14/gosu-"$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget --progress=dot:mega -O /tmp/gosu.asc https://github.com/tianon/gosu/releases/download/1.14/gosu-"$(dpkg --print-architecture | awk -F- '{ print $NF }')".asc \ - && gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc /usr/bin/gosu \ - && chmod +x /usr/bin/gosu \ - && rm -f /tmp/gosu.asc +COPY --from=tianon/gosu /gosu /usr/local/bin/ # Create unprivileged user for building, see # https://github.com/hexops/dockerfile#use-a-static-uid-and-gid