Skip to content

Write build metadata to /i-am-rox-ci-image #249

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

Open
davdhacs wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Write build metadata to /i-am-rox-ci-image #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
24d2d7b
Write build metadata to /i-am-rox-ci-image
davdhacs Apr 13, 2026
5552d79
Add missing tool versions to metadata
davdhacs Apr 13, 2026
b47f37b
Remove accidentally committed aci.dockerfile
davdhacs Apr 13, 2026
8475421
Add yarn, java versions to UI/test image metadata
davdhacs Apr 13, 2026
34c6ec0
Simplify version output: remove grep/head/awk filtering
davdhacs Apr 13, 2026
ae4f0ca
Remove stderr hiding and echo unknown fallbacks
davdhacs Apr 13, 2026
30f2716
Sort tool versions alphabetically in metadata
davdhacs Apr 13, 2026
21e6198
Use full helm version output
davdhacs Apr 13, 2026
8dcc9f3
Rename REVISION to GIT_COMMIT for clarity
davdhacs Apr 13, 2026
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
18 changes: 16 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ ifeq ($(DOCKER),)
DOCKER=docker
endif
QUAY_REPO=stackrox-io
ROX_CI_IMAGE_VERSION=$(shell git describe --tags --abbrev=10)
ROX_CI_IMAGE_GIT_COMMIT=$(shell git rev-parse HEAD)

STACKROX_BUILD_TAG=$(shell scripts/get_tag.sh "stackrox-build")

.PHONY: stackrox-build-image
stackrox-build-image:
$(DOCKER) build \
--platform linux/amd64 \
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_BUILD_TAG) \
-f images/stackrox-build.Dockerfile \
images/
Expand All @@ -19,8 +23,10 @@ STACKROX_TEST_TAG=$(shell scripts/get_tag.sh "stackrox-test")
stackrox-test-image:
$(DOCKER) build \
--platform linux/amd64 \
-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_TEST_TAG) \
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
--build-arg BASE_TAG=$(STACKROX_BUILD_TAG) \
-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_TEST_TAG) \
-f images/stackrox-test.Dockerfile \
images/

Expand All @@ -30,8 +36,10 @@ STACKROX_UI_TEST_TAG=$(shell scripts/get_tag.sh "stackrox-ui-test")
stackrox-ui-test-image:
$(DOCKER) build \
--platform linux/amd64 \
-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_UI_TEST_TAG) \
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
--build-arg BASE_TAG=$(STACKROX_UI_TEST_TAG) \
-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_UI_TEST_TAG) \
-f images/stackrox-ui-test.Dockerfile \
images/

Expand All @@ -51,6 +59,8 @@ test-cci-export:
scanner-build-image:
$(DOCKER) build \
--platform linux/amd64 \
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "scanner-build") \
-f images/scanner-build.Dockerfile \
images/
Expand All @@ -59,6 +69,8 @@ scanner-build-image:
scanner-test-image:
$(DOCKER) build \
--platform linux/amd64 \
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
--build-arg BASE_TAG=$(shell scripts/get_tag.sh "scanner-build") \
-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "scanner-test") \
-f images/scanner-test.Dockerfile \
Expand All @@ -68,6 +80,8 @@ scanner-test-image:
jenkins-plugin-image:
$(DOCKER) build \
--platform linux/amd64 \
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "jenkins-plugin") \
-f images/jenkins-plugin.Dockerfile \
images/
10 changes: 10 additions & 0 deletions images/scanner-build.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,14 @@ RUN fetch --repo="https://github.com/stackrox/ossls" --tag="${OSSLS_VERSION}" --
rm ossls_linux_amd64 && \
ossls version

ARG ROX_CI_IMAGE_VERSION=unknown
ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
RUN { \
echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
echo "gcc=$(gcc --version)"; \
echo "go=$(go version)"; \
echo "make=$(make --version)"; \
} > /i-am-rox-ci-image

WORKDIR /go/src/github.com/stackrox/scanner
14 changes: 14 additions & 0 deletions images/scanner-test.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,20 @@ RUN set -ex \
&& install hub-comment_linux_amd64 /usr/bin/hub-comment \
&& command -v hub-comment

ARG ROX_CI_IMAGE_VERSION=unknown
ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
RUN { \
echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
echo "docker=$(docker version)"; \
echo "gcloud=$(gcloud version)"; \
echo "go=$(go version)"; \
echo "helm=$(helm version)"; \
echo "kubectl=$(kubectl version --client)"; \
echo "oc=$(oc version --client)"; \
echo "yq=$(yq --version)"; \
} > /i-am-rox-ci-image

RUN \
mv /bin/bash /bin/real-bash && \
mv /bin/bash-wrapper /bin/bash
10 changes: 10 additions & 0 deletions images/stackrox-build.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,14 @@ RUN fetch --repo="https://github.com/stackrox/ossls" --tag="${OSSLS_VERSION}" --

ENV CGO_ENABLED=1

ARG ROX_CI_IMAGE_VERSION=unknown
ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
RUN { \
echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
echo "gcc=$(gcc --version)"; \
echo "go=$(go version)"; \
echo "make=$(make --version)"; \
} > /i-am-rox-ci-image

WORKDIR /go/src/github.com/stackrox/rox
20 changes: 20 additions & 0 deletions images/stackrox-test.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,26 @@ RUN set -ex \
# Install roxie.
COPY --from=roxie-installer /usr/local/bin/roxie /usr/bin/roxie

ARG ROX_CI_IMAGE_VERSION=unknown
ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
RUN { \
echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
echo "aws=$(aws --version)"; \
echo "docker=$(docker version)"; \
echo "gcloud=$(gcloud version)"; \
echo "go=$(go version)"; \
echo "gradle=$(gradle --version)"; \
echo "helm=$(helm version)"; \
echo "java=$(java -version 2>&1)"; \
echo "kubectl=$(kubectl version --client)"; \
echo "oc=$(oc version --client)"; \
echo "roxie=$(roxie version)"; \
echo "shellcheck=$(shellcheck --version)"; \
echo "vault=$(vault --version)"; \
echo "yq=$(yq --version)"; \
} > /i-am-rox-ci-image

RUN \
mv /bin/bash /bin/real-bash && \
mv /bin/bash-wrapper /bin/bash
23 changes: 23 additions & 0 deletions images/stackrox-ui-test.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,29 @@ RUN set -ex \
# Install roxie.
COPY --from=roxie-installer /usr/local/bin/roxie /usr/bin/roxie

ARG ROX_CI_IMAGE_VERSION=unknown
ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
RUN { \
echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
echo "aws=$(aws --version)"; \
echo "bats=$(bats --version)"; \
echo "docker=$(docker version)"; \
echo "gcloud=$(gcloud version)"; \
echo "go=$(go version)"; \
echo "gradle=$(gradle --version)"; \
echo "helm=$(helm version)"; \
echo "java=$(java -version 2>&1)"; \
echo "kubectl=$(kubectl version --client)"; \
echo "node=$(node --version)"; \
echo "oc=$(oc version --client)"; \
echo "roxie=$(roxie version)"; \
echo "shellcheck=$(shellcheck --version)"; \
echo "vault=$(vault --version)"; \
echo "yarn=$(yarn --version)"; \
echo "yq=$(yq --version)"; \
} > /i-am-rox-ci-image

RUN \
mv /bin/bash /bin/real-bash && \
mv /bin/bash-wrapper /bin/bash
Loading