Merge branch 'main' into davdhacs/ROX-14476-ubi9-update

Author: davdhacs

.github/actions/build-and-push-image/build-and-push-image.sh

@@ -5,13 +5,17 @@ set -euo pipefail
 build_and_push_image() {
     local image_flavor="$1"
 
-    docker login -u "$QUAY_STACKROX_IO_RW_USERNAME" --password-stdin <<<"$QUAY_STACKROX_IO_RW_PASSWORD" quay.io
+    # For retrieving private images from quay.io/rhacs-eng (roxie).
+    docker login -u "$QUAY_RHACS_ENG_RW_USERNAME" --password-stdin <<<"$QUAY_RHACS_ENG_RW_PASSWORD" quay.io
 
     TAG="$(scripts/get_tag.sh "${image_flavor}")"
     IMAGE="quay.io/stackrox-io/apollo-ci:${TAG}"
 
     make "${image_flavor}-image"
 
+    # For pushing to quay.io/stackrox-io/apollo-ci.
+    docker login -u "$QUAY_STACKROX_IO_RW_USERNAME" --password-stdin <<<"$QUAY_STACKROX_IO_RW_PASSWORD" quay.io
+
     retry 5 true docker push "${IMAGE}"
 
     echo "image-tag=${IMAGE}" >> "${GITHUB_OUTPUT}"

.github/workflows/build.yaml

@@ -12,6 +12,8 @@ on:
 env:
   QUAY_STACKROX_IO_RW_USERNAME: ${{ secrets.QUAY_STACKROX_IO_RW_USERNAME }}
   QUAY_STACKROX_IO_RW_PASSWORD: ${{ secrets.QUAY_STACKROX_IO_RW_PASSWORD }}
+  QUAY_RHACS_ENG_RW_USERNAME: ${{ secrets.QUAY_RHACS_ENG_RW_USERNAME }}
+  QUAY_RHACS_ENG_RW_PASSWORD: ${{ secrets.QUAY_RHACS_ENG_RW_PASSWORD }}
 
 jobs:
 

images/scanner-build.Dockerfile

@@ -35,8 +35,8 @@ RUN dnf update -y && \
     dnf clean all && \
     rm -rf /var/cache/dnf /var/cache/yum
 
-ARG GOLANG_VERSION=1.25.3
-ARG GOLANG_SHA256=0335f314b6e7bfe08c3d0cfaa7c19db961b7b99fb20be62b0a826c992ad14e0f
+ARG GOLANG_VERSION=1.25.7
+ARG GOLANG_SHA256=12e6d6a191091ae27dc31f6efc630e3a3b8ba409baf3573d955b196fdf086005
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 RUN url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \

images/scanner-test.Dockerfile

@@ -63,8 +63,8 @@ RUN dnf update -y \
 ENV USE_GKE_GCLOUD_AUTH_PLUGIN=True
 RUN gke-gcloud-auth-plugin --version
 
-# Install docker 25.0.3
-ARG DOCKER_VERSION=25.0.3
+# Install docker 29.2.1
+ARG DOCKER_VERSION=29.2.1
 RUN set -ex \
  && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" \
  && echo Docker URL: $DOCKER_URL \

images/stackrox-build.Dockerfile

@@ -54,8 +54,8 @@ RUN dnf update -y && \
     dnf clean all && \
     rm -rf /var/cache/dnf /var/cache/yum
 
-ARG GOLANG_VERSION=1.25.3
-ARG GOLANG_SHA256=0335f314b6e7bfe08c3d0cfaa7c19db961b7b99fb20be62b0a826c992ad14e0f
+ARG GOLANG_VERSION=1.25.7
+ARG GOLANG_SHA256=12e6d6a191091ae27dc31f6efc630e3a3b8ba409baf3573d955b196fdf086005
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 RUN url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \

images/stackrox-test.Dockerfile

@@ -2,6 +2,10 @@
 # binaries and images. Builds upon stackrox-build.Dockerfile.
 
 ARG BASE_TAG
+ARG ROXIE_VERSION=0.1.2
+ARG ROXIE_CHECKSUM=sha256:808acf790369f3cb5744c5c03a4f97e2c57e8e752ae2bce952515bed3fdfd00d
+FROM quay.io/rhacs-eng/roxie:v${ROXIE_VERSION}@${ROXIE_CHECKSUM} AS roxie-installer
+
 FROM quay.io/stackrox-io/apollo-ci:${BASE_TAG} as base
 
 # This line makes sure that piped commands in RUN instructions exit early.
@@ -45,7 +49,6 @@ RUN dnf update -y \
         xz \
         zip \
   && dnf remove -y java-1.8.0-openjdk-headless \
-  && dnf --disablerepo="*" --enablerepo="pgdg13" install -y postgresql13 postgresql13-server postgresql13-contrib \
   && dnf --disablerepo="*" --enablerepo="pgdg14" install -y postgresql14 postgresql14-server postgresql14-contrib \
   && dnf --disablerepo="*" --enablerepo="pgdg15" install -y postgresql15 postgresql15-server postgresql15-contrib \
   && dnf clean all \
@@ -61,7 +64,7 @@ RUN set -ex \
   && bats -v
 
 # Install docker binary
-ARG DOCKER_VERSION=20.10.6
+ARG DOCKER_VERSION=29.2.1
 RUN set -ex \
  && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" \
  && echo Docker URL: $DOCKER_URL \
@@ -161,6 +164,9 @@ RUN set -ex \
   && pip3 install pycodestyle=="${PYCODESTYLE_VERSION}" \
                   pylint=="${PYLINT_VERSION}"
 
+# Install roxie.
+COPY --from=roxie-installer /usr/local/bin/roxie /usr/bin/roxie
+
 RUN \
 	mv /bin/bash /bin/real-bash && \
 	mv /bin/bash-wrapper /bin/bash

images/stackrox-ui-test.Dockerfile

@@ -1,5 +1,9 @@
 # Provides the tooling required run UI tests against the StackRox images.
 
+ARG ROXIE_VERSION=0.1.2
+ARG ROXIE_CHECKSUM=sha256:808acf790369f3cb5744c5c03a4f97e2c57e8e752ae2bce952515bed3fdfd00d
+FROM quay.io/rhacs-eng/roxie:v${ROXIE_VERSION}@${ROXIE_CHECKSUM} AS roxie-installer
+
 FROM quay.io/centos/centos:stream9
 
 # This line makes sure that piped commands in RUN instructions exit early.
@@ -72,8 +76,8 @@ RUN dnf update -y \
   && dnf clean all \
   && rm -rf /var/cache/dnf /var/cache/yum
 
-ARG GOLANG_VERSION=1.25.3
-ARG GOLANG_SHA256=0335f314b6e7bfe08c3d0cfaa7c19db961b7b99fb20be62b0a826c992ad14e0f
+ARG GOLANG_VERSION=1.25.7
+ARG GOLANG_SHA256=12e6d6a191091ae27dc31f6efc630e3a3b8ba409baf3573d955b196fdf086005
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 RUN url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
@@ -112,7 +116,7 @@ RUN set -ex \
   && bats -v
 
 # Install docker binary
-ARG DOCKER_VERSION=20.10.6
+ARG DOCKER_VERSION=29.2.1
 RUN set -ex \
  && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" \
  && echo Docker URL: $DOCKER_URL \
@@ -212,6 +216,9 @@ RUN set -ex \
   && pip3 install pycodestyle=="${PYCODESTYLE_VERSION}" \
                   pylint=="${PYLINT_VERSION}"
 
+# Install roxie.
+COPY --from=roxie-installer /usr/local/bin/roxie /usr/bin/roxie
+
 RUN \
 	mv /bin/bash /bin/real-bash && \
 	mv /bin/bash-wrapper /bin/bash