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

---
 ...eploy-service-message-delivery-method-web-push.yaml | 10 ++++++----
 docker-compose.yml                                     |  2 ++
 .../message-delivery-method-web-push/src/server.ts     |  2 --
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/deploy-service-message-delivery-method-web-push.yaml b/.gitea/workflows/deploy-service-message-delivery-method-web-push.yaml
index 9c60052..7679999 100644
--- a/.gitea/workflows/deploy-service-message-delivery-method-web-push.yaml
+++ b/.gitea/workflows/deploy-service-message-delivery-method-web-push.yaml
@@ -17,6 +17,8 @@ jobs:
     env:
       COUCHDB_USER: ${{secrets.COUCHDB_USER}}
       COUCHDB_PASSWORD: ${{secrets.COUCHDB_PASSWORD}}
+      VAPID_SUBJECT: ${{env.VAPID_SUBJECT}}
+      GCM_API_KEY: ${{env.GCM_API_KEY}}
 
     steps:
       - uses: actions/checkout@v4
@@ -35,13 +37,13 @@ jobs:
           pnpm --filter ./services/message-delivery-method-web-push deploy --prod build/service-message-delivery-method-web-push
 
       - name: build docker image
-        run: MESSAGE_DELIVERY_METHOD_WEB_PUSH_TAG=${{env.GITHUB_SHA}} docker compose -p hereconnect build message-delivery-method-web-push
+        run: MESSAGE_DELIVERY_METHOD_WEB_PUSH_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect build message-delivery-method-web-push
 
       - name: start container
-        run: MESSAGE_DELIVERY_METHOD_WEB_PUSH_TAG=${{env.GITHUB_SHA}} docker compose -p hereconnect up -d --pull never message-delivery-method-web-push
+        run: MESSAGE_DELIVERY_METHOD_WEB_PUSH_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect up -d --pull never message-delivery-method-web-push
 
       - name: rename to latest
-        run: docker tag hereconnect/message-delivery-method-web-push:${{env.GITHUB_SHA}} hereconnect/message-delivery-method-web-push:latest
+        run: docker tag hereconnect/message-delivery-method-web-push:commit-${{env.GITHUB_SHA}} hereconnect/message-delivery-method-web-push:latest
 
       - name: rollback on failure
         if: failure()
@@ -51,4 +53,4 @@ jobs:
 
       - name: cleanup docker image
         if: always()
-        run: docker rmi hereconnect/service-couchdb:${{env.GITHUB_SHA}}
+        run: docker rmi hereconnect/message-delivery-method-web-push:commit-${{env.GITHUB_SHA}}
diff --git a/docker-compose.yml b/docker-compose.yml
index 0fe4328..cbd4e0b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,6 +41,8 @@ services:
       dockerfile: ../../services/message-delivery-method-web-push/Dockerfile
     environment:
       - API_URL=http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb:5984
+      - VAPID_SUBJECT=${VAPID_SUBJECT}
+      - GCM_API_KEY=${GCM_API_KEY}
     depends_on:
       - couchdb
     restart: no
diff --git a/services/message-delivery-method-web-push/src/server.ts b/services/message-delivery-method-web-push/src/server.ts
index adb12a9..12fa392 100644
--- a/services/message-delivery-method-web-push/src/server.ts
+++ b/services/message-delivery-method-web-push/src/server.ts
@@ -22,8 +22,6 @@ function limitStringLengthWithEllipsis(str: string, maxLength: number): string {
 }
 
 const start = async () => {
-  console.log('API_URL', process.env.API_URL);
-
   await setupVapidDetails();
   const serviceSeqTracker = await ServiceSeqTracker.Init(
     "_local/service:message-delivery-method-web-push",