chore: update from CentOS Stream 8 to UBI 8

stackrox · Jun 12, 2024 · 4888a62 · 4888a62
1 parent 73f1e5c
commit 4888a62
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 13 deletions.
diff --git a/.github/actions/build-and-push-image/build-and-push-image.sh b/.github/actions/build-and-push-image/build-and-push-image.sh
@@ -8,8 +8,7 @@ build_and_push_image() {
     # Login may be required for pulling the base image for building (if used) and to avoid rate limits.
     docker login -u "$QUAY_RHACS_ENG_RW_USERNAME" --password-stdin <<<"$QUAY_RHACS_ENG_RW_PASSWORD" quay.io
 
-    STACKROX_CENTOS_TAG="$(cat STACKROX_CENTOS_TAG)"
-    TAG="$(scripts/get_tag.sh "$image_flavor" "${STACKROX_CENTOS_TAG}")"
+    TAG="$(scripts/get_tag.sh "$image_flavor")"
     IMAGE="quay.io/rhacs-eng/apollo-ci:${TAG}"
 
     make "$image_flavor"-image

diff --git a/Makefile b/Makefile
@@ -1,6 +1,3 @@
-ifeq ($(STACKROX_CENTOS_TAG),)
-STACKROX_CENTOS_TAG=$(shell cat STACKROX_CENTOS_TAG)
-endif
 ifeq ($(DOCKER),)
 DOCKER=docker
 endif
@@ -12,7 +9,6 @@ STACKROX_BUILD_TAG=$(shell scripts/get_tag.sh "stackrox-build")
 stackrox-build-image:
 	$(DOCKER) build \
 		-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_BUILD_TAG) \
-		--build-arg STACKROX_CENTOS_TAG=$(STACKROX_CENTOS_TAG) \
 		-f images/stackrox-build.Dockerfile \
 		images/
 
@@ -22,7 +18,6 @@ STACKROX_TEST_TAG=$(shell scripts/get_tag.sh "stackrox-test")
 stackrox-test-image:
 	$(DOCKER) build \
 		-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_TEST_TAG) \
-		--build-arg BASE_TAG=$(STACKROX_BUILD_TAG) \
 		-f images/stackrox-test.Dockerfile \
 		images/
 

diff --git a/STACKROX_CENTOS_TAG b/STACKROX_CENTOS_TAG
diff --git a/images/collector.Dockerfile b/images/collector.Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/centos/centos:stream8
+FROM registry.access.redhat.com/ubi8:latest
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

diff --git a/images/scanner-build.Dockerfile b/images/scanner-build.Dockerfile
@@ -1,6 +1,6 @@
 # Provides the tooling required to run Scanner dockerized build targets.
 
-FROM quay.io/centos/centos:stream8
+FROM registry.access.redhat.com/ubi8:latest
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

diff --git a/images/stackrox-build.Dockerfile b/images/stackrox-build.Dockerfile
@@ -1,7 +1,6 @@
 # Provides the tooling required to run StackRox dockerized build targets.
 
-ARG STACKROX_CENTOS_TAG
-FROM quay.io/centos/centos:${STACKROX_CENTOS_TAG} as base
+FROM registry.access.redhat.com/ubi8:latest
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

diff --git a/scripts/get_tag.sh b/scripts/get_tag.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 if [[ -z "${1:-}" ]]; then
-    echo "Usage: $0 <image flavor> [<centos_tag>]"
+    echo "Usage: $0 <image flavor>"
     exit 1
 fi