fix(docker-compose): push ot

bas-kirill · Aug 26, 2024 · aec5419 · aec5419
1 parent 8617b11
commit aec5419
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -175,6 +175,7 @@ jobs:
       - name: Deploy at home lab
         run: ./tools/scripts/deploy/deployDev.sh myshx dev
         env:
+          DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
           SSH_HOST: ${{ secrets.DEV_SSH_HOST }}
           SSH_PORT: ${{ secrets.DEV_SSH_PORT }}
           SSH_USER: ${{ secrets.DEV_SSH_USER }}

diff --git a/tools/docker/docker-compose.yml b/tools/docker/docker-compose.yml
@@ -51,7 +51,7 @@ services:
       - muse
 
   muse-client-dev:
-    image: muse-client-dev:${MUST_CLIENT_DEV_TAG-latest}
+    image: muse-client-dev:${MUSE_CLIENT_DEV_TAG-latest}
     container_name: muse-client-dev
     ports:
       - ${CLIENT_DEV_PORT}:3000

diff --git a/tools/docker/env/dev.env b/tools/docker/env/dev.env
@@ -8,4 +8,4 @@ POSTGRES_PORT=5555
 POSTGRES_USER=muse
 POSTGRES_PASSWORD=muse
 POSTGRES_DB=muse
-POSTGRES_DSN=jdbc:postgresql://muse-postgres:5432/muse
+POSTGRES_DSN=jdbc:postgresql://muse-postgres:5555/muse
diff --git a/tools/scripts/deploy.sh b/tools/scripts/deploy.sh
@@ -4,6 +4,11 @@ currentDir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 rootDir="$currentDir/../../"
 gitCommitSha="$(git rev-parse --short HEAD)"
 
+if [ -z "$DOCKER_HUB_TOKEN" ]; then
+    echo "Error: The required environment variable 'DOCKER_HUB_TOKEN' is not set."
+    exit 1
+fi
+
 if [ -z "$SSH_HOST" ]; then
     echo "Error: The required environment variable 'SSH_HOST' is not set."
     exit 1
@@ -60,10 +65,16 @@ dockerTag="$stage-$gitCommitSha"
 (cd "$rootDir" && exec ./tools/scripts/pushImage.sh "$dockerRepository" "muse-client" "$dockerTag")
 
 sshpass -p "$SSH_PASS" ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" << EOF
+export dockerRepository=$dockerRepository
+echo \$dockerRepository
 export stage=$stage
 echo \$stage
 export dockerTag=$dockerTag
 echo \$dockerTag
+export DOCKER_HUB_TOKEN=$DOCKER_HUB_TOKEN
+echo \$DOCKER_HUB_TOKEN
+
+docker login -u $dockerRepository -p $DOCKER_HUB_TOKEN
 
 cd /tmp
 sudo rm -rf ./muse-project
@@ -72,11 +83,7 @@ cd ./muse-project
 
 ./tools/scripts/clean.sh $stage
 
-MUSE_SERVER_TAG="$dockerTag"
-MUSE_CLIENT_TAG="$dockerTag"
-MUST_CLIENT_DEV_TAG="$dockerTag"
-
-docker compose \
+MUSE_SERVER_TAG="$dockerTag" MUSE_CLIENT_TAG="$dockerTag" MUSE_CLIENT_DEV_TAG="$dockerTag" docker compose \
   -f ./tools/docker/docker-compose.yml \
   --env-file ./tools/docker/env/$stage.env \
   --project-name=muse-$stage \