run correct bash file

nemanjam · Jun 7, 2024 · 12d1b57 · 12d1b57
1 parent d78ac5a
commit 12d1b57
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/docs/temp-code/deploy-docker.sh b/docs/temp-code/deploy-docker.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# REMOTE_PATH="~/traefik-proxy/apps/nmc-docker"
+# REMOTE_HOST="arm1"
+
 REMOTE_HOST=$1
 REMOTE_PATH=$2
 IMAGE_NAME_WITH_TAG=$3
@@ -13,8 +16,14 @@ fi
 # Navigate to the docker-compose.yml folder
 ssh $REMOTE_HOST "cd $REMOTE_PATH && \
 
+            echo 'Old image id:' && \
+            \$(docker image ls --format='{{.Repository}}:{{.ID}}' | grep '$IMAGE_NAME_WITH_TAG')
+
             docker compose down && \
-            docker image rm $IMAGE_NAME_WITH_TAG && \
+            docker image rm '$IMAGE_NAME_WITH_TAG' && \
 
-            docker compose up -d"
+            docker compose up -d && \
+            
+            echo 'New image id:' && \
+            \$(docker image ls --format='{{.Repository}}:{{.ID}}' | grep '$IMAGE_NAME_WITH_TAG')"
 
diff --git a/scripts/deploy-docker.sh b/scripts/deploy-docker.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# REMOTE_PATH="~/traefik-proxy/apps/nmc-docker"
-# REMOTE_HOST="arm1"
-
 REMOTE_HOST=$1
 REMOTE_PATH=$2
 IMAGE_NAME_WITH_TAG=$3
@@ -16,14 +13,8 @@ fi
 # Navigate to the docker-compose.yml folder
 ssh $REMOTE_HOST "cd $REMOTE_PATH && \
 
-            echo 'Old image id:' && \
-            \$(docker image ls --format='{{.Repository}}:{{.ID}}' | grep '$IMAGE_NAME_WITH_TAG')
-
             docker compose down && \
-            docker image rm '$IMAGE_NAME_WITH_TAG' && \
+            docker image rm $IMAGE_NAME_WITH_TAG && \
 
-            docker compose up -d && \
-            
-            echo 'New image id:' && \
-            \$(docker image ls --format='{{.Repository}}:{{.ID}}' | grep '$IMAGE_NAME_WITH_TAG')"
+            docker compose up -d"