From ae63d634a7f4ad6eaa378a555968da16040b4c30 Mon Sep 17 00:00:00 2001 From: Vasilii Mikhailovskii Date: Tue, 3 Dec 2024 17:38:22 +0200 Subject: [PATCH] fix --- .gitea/workflows/deploy-service-couchdb.yaml | 2 +- .gitea/workflows/deploy-service-db-migrations.yaml | 2 +- .../deploy-service-message-delivery-method-web-push.yaml | 2 +- services/db-migrations/migrations/1732483677017-dbs.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deploy-service-couchdb.yaml b/.gitea/workflows/deploy-service-couchdb.yaml index 3df947c..819e095 100644 --- a/.gitea/workflows/deploy-service-couchdb.yaml +++ b/.gitea/workflows/deploy-service-couchdb.yaml @@ -24,7 +24,7 @@ jobs: run: COUCHDB_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect build couchdb - name: start container - run: COUCHDB_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect up -d --pull never couchdb + run: COUCHDB_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect up -d --pull never --no-recreate --wait couchdb - name: rename to latest run: docker tag hereconnect/service-couchdb:commit-${{env.GITHUB_SHA}} hereconnect/service-couchdb:latest diff --git a/.gitea/workflows/deploy-service-db-migrations.yaml b/.gitea/workflows/deploy-service-db-migrations.yaml index 8910295..6617082 100644 --- a/.gitea/workflows/deploy-service-db-migrations.yaml +++ b/.gitea/workflows/deploy-service-db-migrations.yaml @@ -32,7 +32,7 @@ jobs: run: DB_MIGRATIONS_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect build db-migrations - name: start container - run: DB_MIGRATIONS_TAG=commit-${{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 --no-recreate never db-migrations - name: rename to latest run: docker tag hereconnect/service-db-migrations:commit-${{env.GITHUB_SHA}} hereconnect/service-db-migrations:latest 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 c1a3a82..3b91287 100644 --- a/.gitea/workflows/deploy-service-message-delivery-method-web-push.yaml +++ b/.gitea/workflows/deploy-service-message-delivery-method-web-push.yaml @@ -40,7 +40,7 @@ jobs: 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=commit-${{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 --no-recreate --wait message-delivery-method-web-push - name: rename to latest run: docker tag hereconnect/service-message-delivery-method-web-push:commit-${{env.GITHUB_SHA}} hereconnect/service-message-delivery-method-web-push:latest diff --git a/services/db-migrations/migrations/1732483677017-dbs.js b/services/db-migrations/migrations/1732483677017-dbs.js index 04a6f28..2fc7686 100644 --- a/services/db-migrations/migrations/1732483677017-dbs.js +++ b/services/db-migrations/migrations/1732483677017-dbs.js @@ -49,7 +49,7 @@ const headers = { Authorization: "Basic " + btoa(`${urlObject.username}:${urlObject.password}`), }; const getUrl = (dbUrlPath) => { - return `${dbObject.protocol}//${urlObject.host}${urlObject.pathname}${dbUrlPath}${urlObject.search}${urlObject.hash}`; + return `${urlObject.protocol}//${urlObject.host}${urlObject.pathname}${dbUrlPath}${urlObject.search}${urlObject.hash}`; }; export const up = async () => {