From 64c03b511f34105543a8c49fab619627c7655e82 Mon Sep 17 00:00:00 2001
From: Zakaria Mansouri <zakman.dev@gmail.com>
Date: Sun, 31 Dec 2023 16:53:43 +0100
Subject: [PATCH] Update deployment script and docker-compose file

---
 api/oracle-cloud/deploy.ts          | 23 +++++++++++++++++------
 api/oracle-cloud/docker-compose.yml |  4 ++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/api/oracle-cloud/deploy.ts b/api/oracle-cloud/deploy.ts
index bc7bcdda4..b68d9d4cf 100644
--- a/api/oracle-cloud/deploy.ts
+++ b/api/oracle-cloud/deploy.ts
@@ -43,21 +43,23 @@ console.log("⚙️  Deploying to", isProduction ? "Production" : "Staging", "..
 
 let logs: Buffer;
 const sshServer = isProduction ? process.env.SSH_ADDRESS_PRD : process.env.SSH_ADDRESS_STG;
+const sshKeyPath = process.env.SSH_PATH;
 const appPath = "~/app";
-const sshPrefix = "ssh -o StrictHostKeyChecking=no " + sshServer + " ";
+const sshPrefix =
+  "ssh -o StrictHostKeyChecking=no " + (sshKeyPath ? `-i ${sshKeyPath} ` : "") + sshServer + " ";
 
 // Check for existing containers
-logs = execSync(sshPrefix + '"docker ps -aq"');
+logs = execSync(sshPrefix + '"sudo docker ps -aq"');
 
 if (String(logs)) {
   // stop containers
   console.log("⚠️  Stopping all containers ...");
-  logs = execSync(sshPrefix + '"docker stop \\$(docker ps -aq)"');
+  logs = execSync(sshPrefix + '"sudo docker stop \\$(sudo docker ps -aq)"');
   console.log(String(logs));
 
   // delete containers
   console.log("⚠️  Deleting all containers ...");
-  logs = execSync(sshPrefix + '"docker rm \\$(docker ps -aq)"');
+  logs = execSync(sshPrefix + '"sudo docker rm \\$(sudo docker ps -aq)"');
   console.log(String(logs));
   console.log("✅ All containers stopped");
 } else {
@@ -69,10 +71,19 @@ logs = execSync(sshPrefix + '"rm -f -r ' + appPath + '"');
 logs = execSync(sshPrefix + '"mkdir ' + appPath + '"');
 
 console.log("⤴️  Uploading new code ...");
-logs = execSync("rsync -r oracle-cloud/build/* " + sshServer + ":" + appPath);
+logs = execSync(
+  "rsync " +
+    (sshKeyPath ? `-e "ssh -i ${sshKeyPath}" ` : "") +
+    " -r oracle-cloud/build/* " +
+    sshServer +
+    ":" +
+    appPath,
+);
 console.log("✅ New code uploaded.");
 
 console.log("\n⚙️  Starting up the app");
-logs = execSync(sshPrefix + '"docker-compose -f ' + appPath + '/docker-compose.yml up -d --build"');
+logs = execSync(
+  sshPrefix + '"sudo docker-compose -f ' + appPath + '/docker-compose.yml up -d --build"',
+);
 console.log(String(logs));
 console.log("✅ Deployment successful.");
diff --git a/api/oracle-cloud/docker-compose.yml b/api/oracle-cloud/docker-compose.yml
index 4c0adaf08..69d7435d4 100644
--- a/api/oracle-cloud/docker-compose.yml
+++ b/api/oracle-cloud/docker-compose.yml
@@ -6,6 +6,6 @@ services:
     ports:
       - "80:7070"
     env_file:
-      - ~/app-env/api.env
+      - /home/opc/app-env/api.env
     volumes:
-      - /home/${USER}/app-data/api/fetch_cache:/usr/src/repo/api/fetch_cache
+      - /home/opc/app-data/api/fetch_cache:/usr/src/repo/api/fetch_cache