Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump fedora from 36 to 40 in /linux/jre/redhat/src/main/packaging #878

Merged
merged 3 commits into from
Apr 30, 2024
Merged

Bump fedora from 36 to 40 in /linux/jre/redhat/src/main/packaging #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
730d808
Bump fedora from 36 to 40 in /linux/jre/redhat/src/main/packaging
dependabot[bot] Apr 26, 2024
1709259
Merge branch 'master' into dependabot/docker/linux/jre/redhat/src/mai…
gdams Apr 29, 2024
d38fad3
gosu updates
gdams Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions linux/jdk/redhat/src/main/packaging/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 3 additions & 9 deletions linux/jdk/suse/src/main/packaging/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 4 additions & 10 deletions linux/jre/redhat/src/main/packaging/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 3 additions & 9 deletions linux/jre/suse/src/main/packaging/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down