Update to go1.19.4 (#1083)

stackrox · Feb 8, 2023 · 91f5a3c · 91f5a3c
1 parent d6ff6c8
commit 91f5a3c
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-scanner-build-0.3.51
+scanner-build-0.3.56
diff --git 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.