From 1c5ef53daa283a1bf7b218e7b5e9bd3648a3d279 Mon Sep 17 00:00:00 2001 From: Vasilii Mikhailovskii Date: Tue, 3 Dec 2024 14:50:30 +0200 Subject: [PATCH] fix ci/cd --- .gitea/workflows/deploy-service-couchdb.yaml | 3 +-- .gitea/workflows/deploy-service-db-migrations.yaml | 2 +- docker-compose.yml | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy-service-couchdb.yaml b/.gitea/workflows/deploy-service-couchdb.yaml index ce52f39..170e9f8 100644 --- a/.gitea/workflows/deploy-service-couchdb.yaml +++ b/.gitea/workflows/deploy-service-couchdb.yaml @@ -17,8 +17,7 @@ jobs: - uses: actions/checkout@v4 - name: build docker image - run: | - docker build --file services/couchdb/Dockerfile -t hereconnect/service-couchdb:${{env.GITHUB_SHA}} services/couchdb + run: COUCHDB_TAG=${{env.GITHUB_SHA}} docker compose -p hereconnect build couchdb - name: start container env: diff --git a/.gitea/workflows/deploy-service-db-migrations.yaml b/.gitea/workflows/deploy-service-db-migrations.yaml index e18adbb..9293232 100644 --- a/.gitea/workflows/deploy-service-db-migrations.yaml +++ b/.gitea/workflows/deploy-service-db-migrations.yaml @@ -25,7 +25,7 @@ jobs: pnpm --filter ./services/db-migrations deploy --prod build/service-db-migrations - name: build docker image - run: docker build --file services/db-migrations/Dockerfile -t hereconnect/service-db-migrations:${{env.GITHUB_SHA}} build/service-db-migrations + run: DB_MIGRATIONS_TAG=${{env.GITHUB_SHA}} docker compose -p hereconnect build db-migrations - name: start container env: diff --git a/docker-compose.yml b/docker-compose.yml index a67376a..6036498 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,6 @@ services: couchdb: + build: services/couchdb image: hereconnect/service-couchdb:${COUCHDB_TAG:-latest} ports: @@ -22,6 +23,7 @@ services: db-migrations: image: hereconnect/service-db-migrations:${DB_MIGRATIONS_TAG:-latest} + build: build/service-db-migrations volumes: - db_migrations_data:/opt/db-migrations/data environment: