Set web image tags base (#4443)

* Set image tags * Add cloudbuilds
canada-ca · Apr 6, 2023 · 537116d · 537116d
1 parent 1ee8441
commit 537116d
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 2 deletions.
diff --git a/k8s/apps/bases/scanners/web-processor/deployment.yaml b/k8s/apps/bases/scanners/web-processor/deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: web-processor
-          image: gcr.io/track-compliance/web-processor # {"$imagepolicy": "flux-system:web-processor"}
+          image: gcr.io/track-compliance/web-processor:master-test # {"$imagepolicy": "flux-system:web-processor"}
           env:
             - name: DB_NAME
               value: track_dmarc

diff --git a/k8s/apps/bases/scanners/web-scanner/deployment.yaml b/k8s/apps/bases/scanners/web-scanner/deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: web-scanner
-          image: gcr.io/track-compliance/web-scanner # {"$imagepolicy": "flux-system:web-scanner"}
+          image: gcr.io/track-compliance/web-scanner:master-test # {"$imagepolicy": "flux-system:web-scanner"}
           env:
             - name: PYTHONWARNINGS
               value: ignore

diff --git a/scanners/web-processor/cloudbuild.yaml b/scanners/web-processor/cloudbuild.yaml
@@ -0,0 +1,40 @@
+steps:
+
+  - name: 'gcr.io/cloud-builders/docker'
+    id: generate-image-name
+    entrypoint: 'bash'
+    dir: scanners/web-processor
+    args:
+      - '-c'
+      - |
+        echo "gcr.io/$PROJECT_ID/web-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+
+  - name: 'gcr.io/cloud-builders/docker'
+    id: build-https-if-master
+    entrypoint: 'bash'
+    dir: scanners/web-processor
+    args:
+      -  '-c'
+      - |
+        if [[ "$BRANCH_NAME" == "master" ]]
+        then
+            image=$(cat /workspace/imagename)
+            docker build -t $image .
+        else
+          exit 0
+        fi
+
+  - name: 'gcr.io/cloud-builders/docker'
+    id: push-https-if-master
+    entrypoint: 'bash'
+    dir: scanners/web-processor
+    args:
+      - '-c'
+      - |
+        if [[ "$BRANCH_NAME" == "master" ]]
+        then
+          image=$(cat /workspace/imagename)
+          docker push $image
+        else
+          exit 0
+        fi
diff --git a/scanners/web-scanner/cloudbuild.yaml b/scanners/web-scanner/cloudbuild.yaml
@@ -0,0 +1,40 @@
+steps:
+
+  - name: 'gcr.io/cloud-builders/docker'
+    id: generate-image-name
+    entrypoint: 'bash'
+    dir: scanners/web-scanner
+    args:
+      - '-c'
+      - |
+        echo "gcr.io/$PROJECT_ID/web-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+
+  - name: 'gcr.io/cloud-builders/docker'
+    id: build-web-if-master
+    entrypoint: 'bash'
+    dir: scanners/web-scanner
+    args:
+      -  '-c'
+      - |
+        if [[ "$BRANCH_NAME" == "master" ]]
+        then
+            image=$(cat /workspace/imagename)
+            docker build -t $image .
+        else
+          exit 0
+        fi
+
+  - name: 'gcr.io/cloud-builders/docker'
+    id: push-web-if-master
+    entrypoint: 'bash'
+    dir: scanners/web-scanner
+    args:
+      - '-c'
+      - |
+        if [[ "$BRANCH_NAME" == "master" ]]
+        then
+          image=$(cat /workspace/imagename)
+          docker push $image
+        else
+          exit 0
+        fi