From 316ec0d668cfa863f78f21fc249c64615e034cfd Mon Sep 17 00:00:00 2001
From: "Fergus MacConnell WLRS:EX" <f.macconnell@gmail.com>
Date: Wed, 9 Oct 2024 09:35:13 -0700
Subject: [PATCH] Override openshift version in init.

---
 .github/workflows/.deploy.yml | 5 +++++
 docker-compose.yml            | 2 +-
 frontend/openshift.deploy.yml | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
index fa7ccf9af..ae6128930 100644
--- a/.github/workflows/.deploy.yml
+++ b/.github/workflows/.deploy.yml
@@ -23,6 +23,11 @@ jobs:
     name: Initialize
     runs-on: ubuntu-latest
     steps:
+      # Override OpenShift version, if specified
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: ${{ inputs.oc_version || '4' }}
       - name: Initialize
         uses: bcgov-nr/action-deployer-openshift@v3.0.0
         with:
diff --git a/docker-compose.yml b/docker-compose.yml
index 85af32ac5..72d265f76 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -117,7 +117,7 @@ services:
       API_TARGET: "http://localhost:8000/"
       BACKEND_URL: "http://localhost:8000"
       LOG_LEVEL: "info"
-    command: 
+    command: caddy run --config /etc/caddy/Caddyfile
     ports:
       - "3000:3000"
     volumes:
diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
index 466db2366..6d742db2a 100644
--- a/frontend/openshift.deploy.yml
+++ b/frontend/openshift.deploy.yml
@@ -70,6 +70,7 @@ objects:
                 - name: http
                   containerPort: 5173
                   protocol: TCP
+              # command: ["caddy", "run", "--config", "/etc/caddy/Caddyfile"]
               readinessProbe:
                 httpGet:
                   path: /