Merge pull request #640 from dzcode-io/chore/cleanup-using-docker-compose

fix: fixed storage issue on VPS

Author: ZibanPirate

api/oracle-cloud/deploy.ts

@@ -52,24 +52,13 @@ const appPath = "~/app";
 const sshPrefix =
   "ssh -o StrictHostKeyChecking=no " + (sshKeyPath ? `-i ${sshKeyPath} ` : "") + sshServer + " ";
 
-// todo-ZM: let docker-compose handle deletion of old containers
-// Check for existing containers
-logs = execSync(sshPrefix + '"sudo docker ps -aq"');
-
-if (String(logs)) {
-  // stop containers
-  console.log("⚠️  Stopping all containers ...");
-  logs = execSync(sshPrefix + '"sudo docker stop \\$(sudo docker ps -aq)"');
-  console.log(String(logs));
+console.log("⚠️  Cleaning up old containers ...");
+logs = execSync(sshPrefix + '"sudo docker container prune --force"');
+console.log(String(logs));
 
-  // delete containers
-  console.log("⚠️  Deleting all containers ...");
-  logs = execSync(sshPrefix + '"sudo docker rm \\$(sudo docker ps -aq)"');
-  console.log(String(logs));
-  console.log("✅ All containers stopped");
-} else {
-  console.log("⏩ No container found, skipping stopping containers.");
-}
+console.log("⚠️  Cleaning up old images ...");
+logs = execSync(sshPrefix + '"sudo docker image prune --force"');
+console.log(String(logs));
 
 console.log("⚠️  Deleting old code ...");
 logs = execSync(sshPrefix + '"rm -f -r ' + appPath + '"');

api/oracle-cloud/docker-compose.yml

@@ -13,6 +13,11 @@ services:
     build: "."
     ports:
       - "7070:7070"
+    depends_on:
+      postgres:
+        condition: service_started
+      meilisearch:
+        condition: service_started
     env_file:
       - /home/ubuntu/app-env/api.env
     volumes:
@@ -28,7 +33,7 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
       POSTGRES_DB: db
   meilisearch:
-    image: getmeili/meilisearch:latest
+    image: getmeili/meilisearch:v1.11.3
     ports:
       - "7700:7700"
     volumes: