Merge pull request #385 from kabanero-io/aadeshpa_issue_384_update_appsody_to_0.6.1-buildah1.9.0

kvijai82 · web-flow · commit 0c7ce731b8c1 · 2020-05-16T05:09:58.000-04:00
updated the deploy step with upgraded appsody base image in kabanero-…
diff --git a/pipelines/docker/kabanero-utils/Dockerfile b/pipelines/docker/kabanero-utils/Dockerfile
@@ -1,4 +1,4 @@
-FROM appsody/appsody-buildah:0.6.0-buildah1.9.0
+FROM appsody/appsody-buildah:0.6.1-buildah1.9.0
 
 RUN mkdir -p /scripts
 
diff --git a/pipelines/experimental/gitops/build-push-promote-task.yaml b/pipelines/experimental/gitops/build-push-promote-task.yaml
@@ -34,7 +34,7 @@ spec:
     # Refer to https://kabanero.io/docs/ref/general/reference/semver-governance.html for policy details.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -50,7 +50,7 @@ spec:
     # This steps builds the source project using appsody build.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     imagePullPolicy: Always
     command: ["/bin/bash"]
     args:
@@ -112,7 +112,7 @@ spec:
     # Refer to https://kabanero.io/docs/ref/general/reference/semver-governance.html for policy details.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -129,7 +129,7 @@ spec:
     # Push the image built in the build step to the specified image registry.  Optionally sign the image.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
diff --git a/pipelines/experimental/gitops/deploy-kustomize-task.yaml b/pipelines/experimental/gitops/deploy-kustomize-task.yaml
@@ -10,7 +10,7 @@ spec:
       type: git
   steps:
   - name: deploy
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     script: |
         #!/usr/bin/env sh
         
diff --git a/pipelines/experimental/gitops/image-scan-task.yaml b/pipelines/experimental/gitops/image-scan-task.yaml
@@ -37,7 +37,7 @@ spec:
     - name: mount-image          
       securityContext:
         privileged: true
-      image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+      image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
 # Temporarily make copy of mounted image since the mounted image will be unmounted when the container for this task ends.
 # TODO: Determine another way to persist the mounted container image across containers
       command: ['/bin/bash']
diff --git a/pipelines/incubator/build-deploy-task.yaml b/pipelines/incubator/build-deploy-task.yaml
@@ -32,7 +32,7 @@ spec:
     # This steps builds the source project using appsody build.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -85,7 +85,7 @@ spec:
     # Push the image built in the build step to the specified image registry.  Optionally sign the image.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -146,7 +146,7 @@ spec:
     - mountPath: /var/lib/containers
       name: varlibcontainers
   - name: deploy-image
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ['/bin/sh']
     args:
       - -c
diff --git a/pipelines/incubator/build-push-jk-task.yaml b/pipelines/incubator/build-push-jk-task.yaml
@@ -35,7 +35,7 @@ spec:
     # This steps builds the source project using appsody build.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -91,7 +91,7 @@ spec:
     # Push the image built in the build step to the specified image registry.  Optionally sign the image.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
diff --git a/pipelines/incubator/build-push-task.yaml b/pipelines/incubator/build-push-task.yaml
@@ -36,7 +36,7 @@ spec:
     # Refer to https://kabanero.io/docs/ref/general/reference/semver-governance.html for policy details.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -53,7 +53,7 @@ spec:
     # This steps builds the source project using appsody build.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -114,7 +114,7 @@ spec:
     # Refer to https://kabanero.io/docs/ref/general/reference/semver-governance.html for policy details.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -131,7 +131,7 @@ spec:
     # Push the image built in the build step to the specified image registry.  Optionally sign the image.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
diff --git a/pipelines/incubator/build-task.yaml b/pipelines/incubator/build-task.yaml
@@ -27,7 +27,7 @@ spec:
     # This steps builds the source project using appsody build.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
diff --git a/pipelines/incubator/deploy-task.yaml b/pipelines/incubator/deploy-task.yaml
@@ -22,10 +22,10 @@ spec:
     type: string
     default: ""
   steps:
-  - name: enforce-stack-policy-post-build
+  - name: enforce-stack-policy-pre-deploy
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -43,7 +43,7 @@ spec:
     - name: gitsource
       value: git-source
   - name: deploy-image
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ['/bin/sh']
     args:
       - -c
diff --git a/pipelines/incubator/deployment-condition.yaml b/pipelines/incubator/deployment-condition.yaml
@@ -13,7 +13,7 @@ spec:
     description: "The Git event ref"
   check:
     name: deployment-condition
-    image: alpine
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/sh"]
     args:
       - -ce
diff --git a/pipelines/incubator/events/build-push-promote-task.yaml b/pipelines/incubator/events/build-push-promote-task.yaml
@@ -37,7 +37,7 @@ spec:
     # Refer to https://kabanero.io/docs/ref/general/reference/semver-governance.html for policy details.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -53,7 +53,7 @@ spec:
     # This steps builds the source project using appsody build.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     imagePullPolicy: Always
     command: ["/bin/bash"]
     args:
@@ -118,7 +118,7 @@ spec:
     # Refer to https://kabanero.io/docs/ref/general/reference/semver-governance.html for policy details.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -135,7 +135,7 @@ spec:
     # Push the image built in the build step to the specified image registry.  Optionally sign the image.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
diff --git a/pipelines/incubator/events/build-task.yaml b/pipelines/incubator/events/build-task.yaml
@@ -25,7 +25,7 @@ spec:
     # Refer to https://kabanero.io/docs/ref/general/reference/semver-governance.html for policy details.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -41,7 +41,7 @@ spec:
     # This steps builds the source project using appsody build.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     imagePullPolicy: Always
     command: ["/bin/bash"]
     args:
@@ -102,7 +102,7 @@ spec:
     # Refer to https://kabanero.io/docs/ref/general/reference/semver-governance.html for policy details.
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
diff --git a/pipelines/incubator/events/deploy-kustomize-task.yaml b/pipelines/incubator/events/deploy-kustomize-task.yaml
@@ -10,7 +10,7 @@ spec:
       type: git
   steps:
   - name: deploy
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     script: |
         #!/usr/bin/env sh
         
diff --git a/pipelines/incubator/events/deploy-task.yaml b/pipelines/incubator/events/deploy-task.yaml
@@ -23,10 +23,10 @@ spec:
     type: string
     default: ""
   steps:
-  - name: enforce-stack-policy-post-build
+  - name: enforce-stack-policy-pre-deploy
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c
@@ -43,7 +43,7 @@ spec:
     - name: gitsource
       value: git-source
   - name: deploy-image
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ['/bin/sh']
     args:
       - -c
diff --git a/pipelines/incubator/events/deployment-condition.yaml b/pipelines/incubator/events/deployment-condition.yaml
@@ -15,7 +15,7 @@ spec:
     description: "Determine if there should be a local deploy"
   check:
     name: deployment-condition
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/sh"]
     args:
       - -ce
diff --git a/pipelines/incubator/events/image-retag-task.yaml b/pipelines/incubator/events/image-retag-task.yaml
@@ -17,7 +17,7 @@ spec:
       # Pull down the source image from the registry.
       securityContext:
         privileged: true
-      image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+      image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
       command: ["/bin/bash"]
       args:
         - -c
@@ -42,7 +42,7 @@ spec:
       # Tag the pulled image with the new tag. 
       securityContext:
         privileged: true
-      image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+      image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
       command: ["/bin/bash"]
       args:
         - -c
@@ -67,7 +67,7 @@ spec:
       # Push the newly tagged image to the registry.
       securityContext:
         privileged: true
-      image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+      image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
       command: ["/bin/bash"]
       args:
         - -c
diff --git a/pipelines/incubator/events/image-scan-task.yaml b/pipelines/incubator/events/image-scan-task.yaml
@@ -38,7 +38,7 @@ spec:
     - name: mount-image          
       securityContext:
         privileged: true
-      image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+      image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
 # Temporarily make copy of mounted image since the mounted image will be unmounted when the container for this task ends.
 # TODO: Determine another way to persist the mounted container image across containers
       command: ['/bin/bash']
diff --git a/pipelines/incubator/image-retag-task.yaml b/pipelines/incubator/image-retag-task.yaml
@@ -22,7 +22,7 @@ spec:
     - name: buildah-pull
       securityContext:
         privileged: true
-      image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+      image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
       command: ["/bin/bash"]
       args:
         - -c
@@ -45,7 +45,7 @@ spec:
     - name: buildah-tag
       securityContext:
         privileged: true
-      image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+      image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
       command: ["/bin/bash"]
       args:
         - -c
@@ -68,7 +68,7 @@ spec:
     - name: buildah-push
       securityContext:
         privileged: true
-      image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+      image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
       command: ["/bin/bash"]
       args:
         - -c
diff --git a/pipelines/incubator/image-scan-task.yaml b/pipelines/incubator/image-scan-task.yaml
@@ -38,7 +38,7 @@ spec:
     - name: mount-image          
       securityContext:
         privileged: true
-      image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+      image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
 # Temporarily make copy of mounted image since the mounted image will be unmounted when the container for this task ends.
 # TODO: Determine another way to persist the mounted container image across containers
       command: ['/bin/bash']
diff --git a/pipelines/incubator/validate-active-stack-task.yaml b/pipelines/incubator/validate-active-stack-task.yaml
@@ -12,7 +12,7 @@ spec:
   - name: validate-stack-is-active
     securityContext:
       privileged: true
-    image: kabanero/kabanero-utils@sha256:8020573657ed1b80e2b872a37719d6398ee78219296fe6180733f54425f7bd6a
+    image: kabanero/kabanero-utils@sha256:f9ceeb7d2ba94c2216d430e7fb0b16eb6e36da41de79222f47aaac82dfd024da
     command: ["/bin/bash"]
     args:
       - -c

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM appsody/appsody-buildah:0.6.0-buildah1.9.0`
	`1`	`+FROM appsody/appsody-buildah:0.6.1-buildah1.9.0`
`2`	`2`
`3`	`3`	`RUN mkdir -p /scripts`
`4`	`4`