Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions images/scanner-build.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Provides the tooling required to run Scanner dockerized build targets.

FROM registry.access.redhat.com/ubi8:latest
FROM registry.access.redhat.com/ubi9:latest

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN dnf update -y && \
dnf install -y dnf-plugins-core wget && \
dnf config-manager --set-enabled ubi-8-codeready-builder-rpms && \
dnf config-manager --set-enabled ubi-9-codeready-builder-rpms && \
dnf update -y && \
# This set replaces centos:stream8 "Development Tools". It is possible
# rox-ci-image does not need all of these.
Expand All @@ -26,7 +26,6 @@ RUN dnf update -y && \
redhat-rpm-config \
rpm-build \
strace \
ctags \
git \
perl-Fedora-VSP \
perl-generators \
Expand Down
2 changes: 1 addition & 1 deletion images/scanner-test.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ENV PG_MAJOR=15
ENV PATH="$PATH:/usr/pgsql-$PG_MAJOR/bin/"

# Install Postgres repo
RUN dnf --disablerepo="*" install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm
RUN dnf --disablerepo="*" install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm

RUN dnf update -y \
&& dnf install -y \
Expand Down
5 changes: 2 additions & 3 deletions images/stackrox-build.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Provides the tooling required to run StackRox dockerized build targets.

FROM registry.access.redhat.com/ubi8:latest
FROM registry.access.redhat.com/ubi9:latest

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

Expand All @@ -11,7 +11,7 @@ RUN dnf update -y && \
dnf-plugins-core \
wget \
&& \
dnf config-manager --set-enabled ubi-8-codeready-builder-rpms && \
dnf config-manager --set-enabled ubi-9-codeready-builder-rpms && \
dnf update -y && \
wget --quiet -O - https://rpm.nodesource.com/setup_lts.x | bash - && \
wget --quiet -O - https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
Expand All @@ -34,7 +34,6 @@ RUN dnf update -y && \
redhat-rpm-config \
rpm-build \
strace \
ctags \
git \
perl-Fedora-VSP \
perl-generators \
Expand Down
2 changes: 1 addition & 1 deletion images/stackrox-test.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN set -ex \
ENV BASH_ENV /etc/initial-bash.env

# Install Postgres repo
RUN dnf --disablerepo="*" install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm
RUN dnf --disablerepo="*" install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm

# Install all the packages
RUN dnf update -y \
Expand Down
Loading