From 5f979cfe8c07a04c566d262f23b6c9de354a659a Mon Sep 17 00:00:00 2001
From: Vasilii Mikhailovskii <ti.webdev@ya.ru>
Date: Tue, 3 Dec 2024 16:57:30 +0200
Subject: [PATCH] fix ci/cd

---
 .gitea/workflows/deploy-service-db-migrations.yaml | 6 +++---
 docker-compose.yml                                 | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/deploy-service-db-migrations.yaml b/.gitea/workflows/deploy-service-db-migrations.yaml
index 9d13b6e..4265d00 100644
--- a/.gitea/workflows/deploy-service-db-migrations.yaml
+++ b/.gitea/workflows/deploy-service-db-migrations.yaml
@@ -29,14 +29,14 @@ jobs:
           pnpm --filter ./services/db-migrations deploy --prod build/service-db-migrations
 
       - name: build docker image
-        run: DB_MIGRATIONS_TAG=${{env.GITHUB_SHA}} docker compose -p hereconnect build db-migrations
+        run: DB_MIGRATIONS_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect build db-migrations
 
       - name: start container
-        run: DB_MIGRATIONS_TAG=${{env.GITHUB_SHA}} docker compose -p hereconnect up --pull never db-migrations
+        run: DB_MIGRATIONS_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect up --pull never db-migrations
 
 
       - name: cleanup docker image
         if: always()
         run: |
           docker compose -p hereconnect rm db-migrations --force --stop
-          docker rmi hereconnect/service-db-migrations:${{env.GITHUB_SHA}}
+          docker rmi hereconnect/service-db-migrations:commit-${{env.GITHUB_SHA}}
diff --git a/docker-compose.yml b/docker-compose.yml
index cbd4e0b..691d844 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,6 +45,7 @@ services:
       - GCM_API_KEY=${GCM_API_KEY}
     depends_on:
       - couchdb
+      - db-migrations
     restart: no
     logging:
       driver: "json-file"