From 91f5a3cf5425342aa68105d17a6553da0b53efc2 Mon Sep 17 00:00:00 2001 From: Ross Tannenbaum Date: Tue, 7 Feb 2023 16:34:54 -0800 Subject: [PATCH] Update to go1.19.4 (#1083) --- .openshift-ci/Dockerfile.build_root | 2 +- .openshift-ci/build/Dockerfile.build-bundle | 2 +- .openshift-ci/build/Dockerfile.build-db-bundle | 2 +- .openshift-ci/build/Dockerfile.generate-db-dump | 2 +- .../build/Dockerfile.generate-genesis-dump | 2 +- BUILD_IMAGE_VERSION | 2 +- README.md | 15 +++++++++++++++ 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.openshift-ci/Dockerfile.build_root b/.openshift-ci/Dockerfile.build_root index 3c516e33f..90e295656 100644 --- a/.openshift-ci/Dockerfile.build_root +++ b/.openshift-ci/Dockerfile.build_root @@ -10,4 +10,4 @@ # - `make update` and commit the results # - run `/test pj-rehearse-max` on the openshift/release PR to validate the change -FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.51 +FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.56 diff --git a/.openshift-ci/build/Dockerfile.build-bundle b/.openshift-ci/build/Dockerfile.build-bundle index 44c8f1fea..abe5dc7f2 100644 --- a/.openshift-ci/build/Dockerfile.build-bundle +++ b/.openshift-ci/build/Dockerfile.build-bundle @@ -1,4 +1,4 @@ -FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.51 +FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.56 COPY . /go/src/github.com/stackrox/scanner WORKDIR /go/src/github.com/stackrox/scanner diff --git a/.openshift-ci/build/Dockerfile.build-db-bundle b/.openshift-ci/build/Dockerfile.build-db-bundle index 124686f4e..fdd7ab223 100644 --- a/.openshift-ci/build/Dockerfile.build-db-bundle +++ b/.openshift-ci/build/Dockerfile.build-db-bundle @@ -1,4 +1,4 @@ -FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.51 +FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.56 COPY . /go/src/github.com/stackrox/scanner WORKDIR /go/src/github.com/stackrox/scanner diff --git a/.openshift-ci/build/Dockerfile.generate-db-dump b/.openshift-ci/build/Dockerfile.generate-db-dump index 0d0d78480..4b91ef003 100644 --- a/.openshift-ci/build/Dockerfile.generate-db-dump +++ b/.openshift-ci/build/Dockerfile.generate-db-dump @@ -1,4 +1,4 @@ -FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.51 +FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.56 COPY . /go/src/github.com/stackrox/scanner WORKDIR /go/src/github.com/stackrox/scanner diff --git a/.openshift-ci/build/Dockerfile.generate-genesis-dump b/.openshift-ci/build/Dockerfile.generate-genesis-dump index 73202d83f..10eafa53d 100644 --- a/.openshift-ci/build/Dockerfile.generate-genesis-dump +++ b/.openshift-ci/build/Dockerfile.generate-genesis-dump @@ -1,4 +1,4 @@ -FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.51 +FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.3.56 COPY . /go/src/github.com/stackrox/scanner WORKDIR /go/src/github.com/stackrox/scanner diff --git a/BUILD_IMAGE_VERSION b/BUILD_IMAGE_VERSION index 9189ce3b9..48d7cbe02 100644 --- a/BUILD_IMAGE_VERSION +++ b/BUILD_IMAGE_VERSION @@ -1 +1 @@ -scanner-build-0.3.51 +scanner-build-0.3.56 diff --git a/README.md b/README.md index c2fa534d7..0834426cb 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,21 @@ $ make image For any other time, just run `make image`. +## Updating CI base image + +The Scanner repository relies on the images built in https://github.com/stackrox/rox-ci-image +for CI. Sometimes, it is necessary to update the image used +(for example, to build Scanner with an updated Go version). + +To do this, only the following is necessary: + +* Update [BUILD_IMAGE_VERSION](BUILD_IMAGE_VERSION) +* Update [.openshift-ci/Dockerfile.build_root](.openshift-ci/Dockerfile.build_root) + +There are other references to apollo-ci images within .openshift-ci/build. +It is not necessary to update those for CI, as OpenShift CI will NOT use the +FROM inside the respective Dockerfile. + ## Testing There are various unit tests and bench tests scattered around the codebase.