Push scanner images to quay.io as well (#441)

stackrox · Aug 25, 2021 · 045e9f6 · 045e9f6
1 parent 59c5916
commit 045e9f6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -346,20 +346,33 @@ commands:
             gcr_scanner_image="us.gcr.io/stackrox-ci/${scanner_image_name}:${tag}"
             gcr_db_image="us.gcr.io/stackrox-ci/${db_image_name}:${tag}"
 
-            dockerhub_scanner_image="stackrox/${scanner_image_name}:${tag}"
-            dockerhub_db_image="stackrox/${db_image_name}:${tag}"
-
             ./scripts/push-as-manifest-list.sh "${gcr_scanner_image}"
             ./scripts/push-as-manifest-list.sh "${gcr_db_image}"
 
+            # Retag for docker.io
             docker login -u "$DOCKER_IO_PUSH_USERNAME" -p "$DOCKER_IO_PUSH_PASSWORD" docker.io
 
+            dockerhub_scanner_image="stackrox/${scanner_image_name}:${tag}"
             docker tag "${gcr_scanner_image}" "${dockerhub_scanner_image}"
             ./scripts/push-as-manifest-list.sh "${dockerhub_scanner_image}"
 
+            dockerhub_db_image="stackrox/${db_image_name}:${tag}"
             docker tag "${gcr_db_image}" "${dockerhub_db_image}"
             ./scripts/push-as-manifest-list.sh "${dockerhub_db_image}"
 
+            # Retag for quay.io
+
+            docker login -u "$QUAY_CGORMAN1_RW_USER" -p "$QUAY_CGORMAN1_RW_PASSWORD" quay.io
+
+            QUAY_REPO="cgorman1"
+            quay_scanner_image="quay.io/$QUAY_REPO/${scanner_image_name}:${tag}"
+            docker tag "${gcr_scanner_image}" "${quay_scanner_image}"
+            ./scripts/push-as-manifest-list.sh "${quay_scanner_image}"
+
+            quay_db_image="quay.io/$QUAY_REPO/${db_image_name}:${tag}"
+            docker tag "${gcr_db_image}" "${quay_db_image}"
+            ./scripts/push-as-manifest-list.sh "${quay_db_image}"
+
             if [[ -n "$CIRCLE_TAG" ]]; then
                 docker login -u "$STACKROX_IO_PUSH_USERNAME" -p "$STACKROX_IO_PUSH_PASSWORD" stackrox.io
 

diff --git a/e2etests/node_scan_test.go b/e2etests/node_scan_test.go
@@ -322,9 +322,6 @@ func TestNodeKernelVulnerabilities(t *testing.T) {
 				Version: "5.3.0-1019",
 			},
 			expectedCVEs: []expectedCVE{
-				{
-					id: "CVE-2020-27675",
-				},
 				{
 					id:      "CVE-2020-14381",
 					fixedBy: "5.3.0-1020.22~18.04.1",