Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try centos stream9 #207

Closed
wants to merge 4 commits into from
Closed

try centos stream9 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ea5abb
try centos stream9
gavin-stackrox Jun 12, 2024
781d236
power!
gavin-stackrox Jun 12, 2024
6277679
scanner!
gavin-stackrox Jun 12, 2024
689cc2a
collector!
gavin-stackrox Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@ 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/

.PHONY: scanner-build-image
scanner-build-image:
$(DOCKER) build \
-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "scanner-build") \
--build-arg STACKROX_CENTOS_TAG=$(STACKROX_CENTOS_TAG) \
-f images/scanner-build.Dockerfile \
images/

Expand Down
2 changes: 1 addition & 1 deletion STACKROX_CENTOS_TAG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
stream8
stream9
3 changes: 2 additions & 1 deletion images/collector.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]

Expand Down
3 changes: 2 additions & 1 deletion images/scanner-build.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Provides the tooling required to run Scanner dockerized build targets.

FROM quay.io/centos/centos:stream8
ARG STACKROX_CENTOS_TAG
FROM quay.io/centos/centos:${STACKROX_CENTOS_TAG}

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

Expand Down
4 changes: 2 additions & 2 deletions images/stackrox-build.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]

Expand All @@ -13,7 +13,7 @@ RUN dnf update -y && \
epel-release \
wget \
&& \
dnf config-manager --set-enabled powertools && \
dnf config-manager --set-enabled crb && \
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 && \
Expand Down
Loading