fix ci

.gitea/workflows/deploy-app-frontend.yaml

@@ -23,6 +23,7 @@ jobs:
       VITE_MANIFEST_NAME: НаСвязи
       VITE_MANIFEST_SHORT_NAME: НаСвязи
       VITE_MANIFEST_ID: https://hereconnect.condev.ru
+      VITE_READ_BASE_URL: ${{ vars.READ_BASE_URL }}
       #VITE_MANIFEST_START_URL: https://hereconnect.condev.ru/
       #VITE_MANIFEST_SCOPE: https://hereconnect.condev.ru/
 

.gitea/workflows/deploy-service-tg-bot.yaml

@@ -19,8 +19,8 @@ jobs:
     env:
       COUCHDB_USER: ${{ secrets.COUCHDB_USER }}
       COUCHDB_PASSWORD: ${{ secrets.COUCHDB_PASSWORD }}
-      VAPID_SUBJECT: ${{ vars.VAPID_SUBJECT }}
-      GCM_API_KEY: ${{ vars.GCM_API_KEY }}
+      BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
+      READ_BASE_URL: ${{ vars.READ_BASE_URL }}
 
     steps:
       - uses: actions/checkout@v4
@@ -43,10 +43,10 @@ jobs:
           pnpm --filter ./services/tg-bot deploy --prod build/service-tg-bot
 
       - name: build docker image
-        run: MESSAGE_DELIVERY_METHOD_WEB_PUSH_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect build tg-bot
+        run: TG_BOT_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect build tg-bot
 
       - name: start container
-        run: MESSAGE_DELIVERY_METHOD_WEB_PUSH_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect up -d --pull never --wait tg-bot
+        run: TG_BOT_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect up -d --pull never --wait tg-bot
 
       - name: rename to latest
         run: docker tag hereconnect/service-tg-bot:commit-${{env.GITHUB_SHA}} hereconnect/service-tg-bot:latest
@@ -57,6 +57,6 @@ jobs:
           COUCHDB_TAG: latest
         run: docker compose -p hereconnect up -d --pull never --wait tg-bot
 
-#      - name: cleanup docker image
-#        if: always()
-#        run: docker rmi hereconnect/service-tg-bot:commit-${{env.GITHUB_SHA}}
+      - name: cleanup docker image
+        if: always()
+        run: docker rmi hereconnect/service-tg-bot:commit-${{env.GITHUB_SHA}}

docker-compose.yml

@@ -62,7 +62,7 @@ services:
         max-file: "10"
 
   tg-bot:
-    image: hereconnect/service-tg-bot:${MESSAGE_DELIVERY_METHOD_WEB_PUSH_TAG:-latest}
+    image: hereconnect/service-tg-bot:${TG_BOT_TAG:-latest}
     build:
       context: build/service-tg-bot
       dockerfile: ../../services/tg-bot/Dockerfile