Skip to content

Commit 954c9c4

Browse files
davdhacsdavdhacs
authored
Write build metadata to /i-am-rox-ci-image (#249)
1 parent 828431e commit 954c9c4

6 files changed

Lines changed: 93 additions & 2 deletions

‎Makefile‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ ifeq ($(DOCKER),)
22
DOCKER=docker
33
endif
44
QUAY_REPO=stackrox-io
5+
ROX_CI_IMAGE_VERSION=$(shell git describe --tags --abbrev=10)
6+
ROX_CI_IMAGE_GIT_COMMIT=$(shell git rev-parse HEAD)
57

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

810
.PHONY: stackrox-build-image
911
stackrox-build-image:
1012
$(DOCKER) build \
1113
--platform linux/amd64 \
14+
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
15+
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
1216
-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_BUILD_TAG) \
1317
-f images/stackrox-build.Dockerfile \
1418
images/
@@ -19,8 +23,10 @@ STACKROX_TEST_TAG=$(shell scripts/get_tag.sh "stackrox-test")
1923
stackrox-test-image:
2024
$(DOCKER) build \
2125
--platform linux/amd64 \
22-
-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_TEST_TAG) \
26+
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
27+
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
2328
--build-arg BASE_TAG=$(STACKROX_BUILD_TAG) \
29+
-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_TEST_TAG) \
2430
-f images/stackrox-test.Dockerfile \
2531
images/
2632

@@ -30,8 +36,10 @@ STACKROX_UI_TEST_TAG=$(shell scripts/get_tag.sh "stackrox-ui-test")
3036
stackrox-ui-test-image:
3137
$(DOCKER) build \
3238
--platform linux/amd64 \
33-
-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_UI_TEST_TAG) \
39+
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
40+
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
3441
--build-arg BASE_TAG=$(STACKROX_UI_TEST_TAG) \
42+
-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_UI_TEST_TAG) \
3543
-f images/stackrox-ui-test.Dockerfile \
3644
images/
3745

@@ -51,6 +59,8 @@ test-cci-export:
5159
scanner-build-image:
5260
$(DOCKER) build \
5361
--platform linux/amd64 \
62+
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
63+
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
5464
-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "scanner-build") \
5565
-f images/scanner-build.Dockerfile \
5666
images/
@@ -59,6 +69,8 @@ scanner-build-image:
5969
scanner-test-image:
6070
$(DOCKER) build \
6171
--platform linux/amd64 \
72+
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
73+
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
6274
--build-arg BASE_TAG=$(shell scripts/get_tag.sh "scanner-build") \
6375
-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "scanner-test") \
6476
-f images/scanner-test.Dockerfile \
@@ -68,6 +80,8 @@ scanner-test-image:
6880
jenkins-plugin-image:
6981
$(DOCKER) build \
7082
--platform linux/amd64 \
83+
--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
84+
--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
7185
-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "jenkins-plugin") \
7286
-f images/jenkins-plugin.Dockerfile \
7387
images/

‎images/scanner-build.Dockerfile‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,14 @@ RUN fetch --repo="https://github.com/stackrox/ossls" --tag="${OSSLS_VERSION}" --
6262
rm ossls_linux_amd64 && \
6363
ossls version
6464

65+
ARG ROX_CI_IMAGE_VERSION=unknown
66+
ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
67+
RUN { \
68+
echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
69+
echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
70+
echo "gcc=$(gcc --version)"; \
71+
echo "go=$(go version)"; \
72+
echo "make=$(make --version)"; \
73+
} > /i-am-rox-ci-image
74+
6575
WORKDIR /go/src/github.com/stackrox/scanner

‎images/scanner-test.Dockerfile‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,20 @@ RUN set -ex \
107107
&& install hub-comment_linux_amd64 /usr/bin/hub-comment \
108108
&& command -v hub-comment
109109

110+
ARG ROX_CI_IMAGE_VERSION=unknown
111+
ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
112+
RUN { \
113+
echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
114+
echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
115+
echo "docker=$(docker version)"; \
116+
echo "gcloud=$(gcloud version)"; \
117+
echo "go=$(go version)"; \
118+
echo "helm=$(helm version)"; \
119+
echo "kubectl=$(kubectl version --client)"; \
120+
echo "oc=$(oc version --client)"; \
121+
echo "yq=$(yq --version)"; \
122+
} > /i-am-rox-ci-image
123+
110124
RUN \
111125
mv /bin/bash /bin/real-bash && \
112126
mv /bin/bash-wrapper /bin/bash

‎images/stackrox-build.Dockerfile‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,14 @@ RUN fetch --repo="https://github.com/stackrox/ossls" --tag="${OSSLS_VERSION}" --
8383

8484
ENV CGO_ENABLED=1
8585

86+
ARG ROX_CI_IMAGE_VERSION=unknown
87+
ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
88+
RUN { \
89+
echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
90+
echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
91+
echo "gcc=$(gcc --version)"; \
92+
echo "go=$(go version)"; \
93+
echo "make=$(make --version)"; \
94+
} > /i-am-rox-ci-image
95+
8696
WORKDIR /go/src/github.com/stackrox/rox

‎images/stackrox-test.Dockerfile‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,26 @@ RUN set -ex \
167167
# Install roxie.
168168
COPY --from=roxie-installer /usr/local/bin/roxie /usr/bin/roxie
169169

170+
ARG ROX_CI_IMAGE_VERSION=unknown
171+
ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
172+
RUN { \
173+
echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
174+
echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
175+
echo "aws=$(aws --version)"; \
176+
echo "docker=$(docker version)"; \
177+
echo "gcloud=$(gcloud version)"; \
178+
echo "go=$(go version)"; \
179+
echo "gradle=$(gradle --version)"; \
180+
echo "helm=$(helm version)"; \
181+
echo "java=$(java -version 2>&1)"; \
182+
echo "kubectl=$(kubectl version --client)"; \
183+
echo "oc=$(oc version --client)"; \
184+
echo "roxie=$(roxie version)"; \
185+
echo "shellcheck=$(shellcheck --version)"; \
186+
echo "vault=$(vault --version)"; \
187+
echo "yq=$(yq --version)"; \
188+
} > /i-am-rox-ci-image
189+
170190
RUN \
171191
mv /bin/bash /bin/real-bash && \
172192
mv /bin/bash-wrapper /bin/bash

‎images/stackrox-ui-test.Dockerfile‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,29 @@ RUN set -ex \
219219
# Install roxie.
220220
COPY --from=roxie-installer /usr/local/bin/roxie /usr/bin/roxie
221221

222+
ARG ROX_CI_IMAGE_VERSION=unknown
223+
ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
224+
RUN { \
225+
echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
226+
echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
227+
echo "aws=$(aws --version)"; \
228+
echo "bats=$(bats --version)"; \
229+
echo "docker=$(docker version)"; \
230+
echo "gcloud=$(gcloud version)"; \
231+
echo "go=$(go version)"; \
232+
echo "gradle=$(gradle --version)"; \
233+
echo "helm=$(helm version)"; \
234+
echo "java=$(java -version 2>&1)"; \
235+
echo "kubectl=$(kubectl version --client)"; \
236+
echo "node=$(node --version)"; \
237+
echo "oc=$(oc version --client)"; \
238+
echo "roxie=$(roxie version)"; \
239+
echo "shellcheck=$(shellcheck --version)"; \
240+
echo "vault=$(vault --version)"; \
241+
echo "yarn=$(yarn --version)"; \
242+
echo "yq=$(yq --version)"; \
243+
} > /i-am-rox-ci-image
244+
222245
RUN \
223246
mv /bin/bash /bin/real-bash && \
224247
mv /bin/bash-wrapper /bin/bash

0 commit comments

Comments
 (0)