gosu updates

adoptium · Apr 30, 2024 · d38fad3 · d38fad3
1 parent 1709259
commit d38fad3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 37 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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