diff --git a/images/scanner-build.Dockerfile b/images/scanner-build.Dockerfile index 96935358..ff566700 100644 --- a/images/scanner-build.Dockerfile +++ b/images/scanner-build.Dockerfile @@ -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. @@ -26,7 +26,6 @@ RUN dnf update -y && \ redhat-rpm-config \ rpm-build \ strace \ - ctags \ git \ perl-Fedora-VSP \ perl-generators \ diff --git a/images/scanner-test.Dockerfile b/images/scanner-test.Dockerfile index 9e7d5fa2..dd8970e5 100644 --- a/images/scanner-test.Dockerfile +++ b/images/scanner-test.Dockerfile @@ -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 \ diff --git a/images/stackrox-build.Dockerfile b/images/stackrox-build.Dockerfile index 0ab191f2..fce437c5 100644 --- a/images/stackrox-build.Dockerfile +++ b/images/stackrox-build.Dockerfile @@ -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"] @@ -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 && \ @@ -34,7 +34,6 @@ RUN dnf update -y && \ redhat-rpm-config \ rpm-build \ strace \ - ctags \ git \ perl-Fedora-VSP \ perl-generators \ diff --git a/images/stackrox-test.Dockerfile b/images/stackrox-test.Dockerfile index c780fb58..ce56d0ff 100644 --- a/images/stackrox-test.Dockerfile +++ b/images/stackrox-test.Dockerfile @@ -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 \