ROX-22044: postgresql 15 (#1416)

stackrox · Mar 15, 2024 · 0ef4177 · 0ef4177
1 parent 794eb8e
commit 0ef4177
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 69 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
   pre-build-updater:
     runs-on: ubuntu-latest
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -42,7 +42,7 @@ jobs:
   pre-build-scanner:
     runs-on: ubuntu-latest
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -69,7 +69,7 @@ jobs:
   style-check:
     runs-on: ubuntu-latest
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -90,7 +90,7 @@ jobs:
     needs:
       - pre-build-scanner
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -119,7 +119,7 @@ jobs:
     needs:
       - pre-build-scanner
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -153,7 +153,7 @@ jobs:
     needs:
       - pre-build-updater
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -194,7 +194,7 @@ jobs:
     needs:
       - generate-genesis-dump
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -236,7 +236,7 @@ jobs:
       always() &&
       (needs.generate-genesis-dump.result == 'success' || needs.generate-genesis-dump.result == 'skipped')
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -289,7 +289,7 @@ jobs:
       always() &&
       (needs.generate-db-dump.result == 'success' || needs.generate-db-dump.result == 'skipped')
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -334,7 +334,7 @@ jobs:
       - generate-scanner-db-bundle
     if: always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled')
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -400,7 +400,7 @@ jobs:
     needs:
       - generate-genesis-dump
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -436,7 +436,7 @@ jobs:
     needs:
       - generate-db-dump
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -463,7 +463,7 @@ jobs:
     needs:
       - generate-db-dump
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -495,7 +495,7 @@ jobs:
     needs:
       - generate-db-dump
     container:
-      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+      image: quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.openshift-ci/Dockerfile.build_root b/.openshift-ci/Dockerfile.build_root
@@ -10,4 +10,4 @@
 # - `make update` and commit the results
 # - run `/test pj-rehearse-max` on the openshift/release PR to validate the change
 
-FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
diff --git a/.openshift-ci/build/Dockerfile.build-bundle b/.openshift-ci/build/Dockerfile.build-bundle
@@ -1,4 +1,4 @@
-FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
 
 COPY . /go/src/github.com/stackrox/scanner
 WORKDIR /go/src/github.com/stackrox/scanner

diff --git a/.openshift-ci/build/Dockerfile.build-db-bundle b/.openshift-ci/build/Dockerfile.build-db-bundle
@@ -1,4 +1,4 @@
-FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
 
 COPY . /go/src/github.com/stackrox/scanner
 WORKDIR /go/src/github.com/stackrox/scanner

diff --git a/.openshift-ci/build/Dockerfile.generate-db-dump b/.openshift-ci/build/Dockerfile.generate-db-dump
@@ -1,4 +1,4 @@
-FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
 
 COPY . /go/src/github.com/stackrox/scanner
 WORKDIR /go/src/github.com/stackrox/scanner

diff --git a/.openshift-ci/build/Dockerfile.generate-genesis-dump b/.openshift-ci/build/Dockerfile.generate-genesis-dump
@@ -1,4 +1,4 @@
-FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.61
+FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.65
 
 COPY . /go/src/github.com/stackrox/scanner
 WORKDIR /go/src/github.com/stackrox/scanner

diff --git a/BUILD_IMAGE_VERSION b/BUILD_IMAGE_VERSION
@@ -1 +1 @@
-scanner-build-0.3.61
+scanner-build-0.3.65
diff --git a/image/db/rhel/Dockerfile b/image/db/rhel/Dockerfile
@@ -16,7 +16,7 @@ LABEL name="scanner-db" \
       summary="Image scanner database for the StackRox Kubernetes Security Platform" \
       description="This image supports image scanning in the StackRox Kubernetes Security Platform."
 
-ENV PG_MAJOR=12
+ENV PG_MAJOR=15
 ENV PATH="$PATH:/usr/pgsql-$PG_MAJOR/bin/" \
     PGDATA="/var/lib/postgresql/data/pgdata"
 
@@ -37,7 +37,7 @@ RUN curl -sSLf https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-K
     adduser postgres -u 70 -g 70 -d /var/lib/postgresql -s /bin/sh && \
     microdnf install \
         ca-certificates libicu systemd-sysv glibc-locale-source glibc-langpack-en \
-        postgresql12-server && \
+        postgresql15-server && \
     # The removal of /usr/share/zoneinfo from UBI minimal images is intentional.
     # After building the image, the image is reduced in size as much as possible,
     # and the /usr/share/zoneinfo directory is purged as it saves space

diff --git a/image/db/rhel/Dockerfile.slim b/image/db/rhel/Dockerfile.slim
@@ -16,7 +16,7 @@ LABEL name="scanner-db-slim" \
       summary="Image scanner database for the StackRox Kubernetes Security Platform" \
       description="This image supports image scanning in the StackRox Kubernetes Security Platform."
 
-ENV PG_MAJOR=12
+ENV PG_MAJOR=15
 ENV PATH="$PATH:/usr/pgsql-$PG_MAJOR/bin/" \
     PGDATA="/var/lib/postgresql/data/pgdata"
 
@@ -37,7 +37,7 @@ RUN curl -sSLf https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-K
     adduser postgres -u 70 -g 70 -d /var/lib/postgresql -s /bin/sh && \
     microdnf install \
         ca-certificates libicu systemd-sysv glibc-locale-source glibc-langpack-en \
-        postgresql12-server && \
+        postgresql15-server && \
     # The removal of /usr/share/zoneinfo from UBI minimal images is intentional.
     # After building the image, the image is reduced in size as much as possible,
     # and the /usr/share/zoneinfo directory is purged as it saves space

diff --git a/image/db/rhel/konflux.Dockerfile b/image/db/rhel/konflux.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.redhat.io/rhel8/postgresql-12:latest AS scanner-db-common
+FROM registry.redhat.io/rhel8/postgresql-15:latest AS scanner-db-common
 
 LABEL \
     com.redhat.license_terms="https://www.redhat.com/agreements" \
@@ -35,7 +35,7 @@ RUN dnf upgrade -y --nobest && \
     rm -rf /var/cache/dnf /var/cache/yum && \
     chmod +x /usr/local/bin/docker-entrypoint.sh
 
-ENV PG_MAJOR=12 \
+ENV PG_MAJOR=15 \
     PGDATA="/var/lib/postgresql/data/pgdata"
 
 ENTRYPOINT ["docker-entrypoint.sh"]