collector!

stackrox · Jun 12, 2024 · 689cc2a · 689cc2a
1 parent 6277679
commit 689cc2a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -41,6 +41,7 @@ test-cci-export:
 collector-image:
 	$(DOCKER) build \
 		-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "collector") \
+		--build-arg STACKROX_CENTOS_TAG=$(STACKROX_CENTOS_TAG) \
 		-f images/collector.Dockerfile \
 		images/
 

diff --git a/images/collector.Dockerfile b/images/collector.Dockerfile
@@ -1,4 +1,5 @@
-FROM quay.io/centos/centos:stream8
+ARG STACKROX_CENTOS_TAG
+FROM quay.io/centos/centos:${STACKROX_CENTOS_TAG}
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

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

diff --git a/images/stackrox-build.Dockerfile b/images/stackrox-build.Dockerfile
@@ -1,7 +1,7 @@
 # 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 quay.io/centos/centos:${STACKROX_CENTOS_TAG}
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]