From 6832cf878b6406d32ca5b07e2869dc3c938e6592 Mon Sep 17 00:00:00 2001
From: James Blair <mail@jamesblair.net>
Date: Mon, 31 Jul 2023 14:04:19 +1200
Subject: [PATCH] Use older image and fix deploy pipeline.

---
 2023-07-31-acs-workflows/README.org           |  2 ++
 2023-07-31-acs-workflows/guestbook/Dockerfile |  2 +-
 .../guestbook/manifests/deploy-pipeline.yaml  | 23 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/2023-07-31-acs-workflows/README.org b/2023-07-31-acs-workflows/README.org
index 2c3d938..3d9e9f1 100644
--- a/2023-07-31-acs-workflows/README.org
+++ b/2023-07-31-acs-workflows/README.org
@@ -128,6 +128,8 @@ spec:
       - name: dev
         container:
           image: quay.io/devfile/universal-developer-image:latest
+          memoryLimit: 4Gi
+          memoryRequest: 2Gi
     commands:
       - id: build
         exec:
diff --git a/2023-07-31-acs-workflows/guestbook/Dockerfile b/2023-07-31-acs-workflows/guestbook/Dockerfile
index 6612c40..841054b 100644
--- a/2023-07-31-acs-workflows/guestbook/Dockerfile
+++ b/2023-07-31-acs-workflows/guestbook/Dockerfile
@@ -4,7 +4,7 @@ COPY go.mod /guestbook/
 COPY go.sum /guestbook/
 RUN cd /guestbook && go build
 
-FROM docker.io/ubuntu:jammy-20221130
+FROM docker.io/ubuntu:jammy-20230522
 
 COPY --from=builder /guestbook/guestbook /app/guestbook
 
diff --git a/2023-07-31-acs-workflows/guestbook/manifests/deploy-pipeline.yaml b/2023-07-31-acs-workflows/guestbook/manifests/deploy-pipeline.yaml
index 3e7b32d..2b63da0 100644
--- a/2023-07-31-acs-workflows/guestbook/manifests/deploy-pipeline.yaml
+++ b/2023-07-31-acs-workflows/guestbook/manifests/deploy-pipeline.yaml
@@ -28,6 +28,22 @@ spec:
       name: PATH_CONTEXT
       type: string
   tasks:
+    - name: fetch-repository
+      params:
+        - name: url
+          value: $(params.GIT_REPO)
+        - name: revision
+          value: $(params.GIT_REVISION)
+        - name: subdirectory
+          value: ''
+        - name: deleteExisting
+          value: 'true'
+      taskRef:
+        kind: ClusterTask
+        name: git-clone
+      workspaces:
+        - name: output
+          workspace: workspace
     - name: image-scan
       params:
         - name: image
@@ -38,6 +54,8 @@ spec:
           value: roxsecrets
         - name: output_format
           value: json
+      runAfter:
+        - fetch-repository
       taskRef:
         kind: ClusterTask
         name: rox-image-scan
@@ -57,11 +75,14 @@ spec:
     - name: deploy
       params:
         - name: SCRIPT
-          value: oc rollout status deploy/$(params.APP_NAME)
+          value: ls -la && oc apply -f 2023-07-31-acs-workflows/guestbook/manifests/deployment.yaml && oc rollout status deploy/$(params.APP_NAME)
       runAfter:
         - image-check
       taskRef:
         kind: ClusterTask
         name: openshift-client
+      workspaces:
+        - name: manifest-dir
+          workspace: workspace
   workspaces:
     - name: workspace