From 1a2bbf8174c6a5bb249e315e2fd5076db490ada2 Mon Sep 17 00:00:00 2001 From: Vasilii Mikhailovskii Date: Tue, 3 Dec 2024 15:00:42 +0200 Subject: [PATCH] fix ci/cd --- .gitea/workflows/deploy-service-db-migrations.yaml | 5 ++++- docker-compose.yml | 1 - services/couchdb/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy-service-db-migrations.yaml b/.gitea/workflows/deploy-service-db-migrations.yaml index 9293232..22e9771 100644 --- a/.gitea/workflows/deploy-service-db-migrations.yaml +++ b/.gitea/workflows/deploy-service-db-migrations.yaml @@ -33,6 +33,9 @@ jobs: COUCHDB_PASSWORD: ${{secrets.COUCHDB_PASSWORD}} run: DB_MIGRATIONS_TAG=${{env.GITHUB_SHA}} docker compose -p hereconnect up --pull never db-migrations + - name: cleanup docker image if: always() - run: docker rmi hereconnect/service-db-migrations:${{env.GITHUB_SHA}} + run: | + docker rmi hereconnect/service-db-migrations:${{env.GITHUB_SHA}} + docker compose -p hereconnect rm db-migrations --force --stop diff --git a/docker-compose.yml b/docker-compose.yml index 6036498..d45cce8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,6 @@ services: couchdb: build: services/couchdb image: hereconnect/service-couchdb:${COUCHDB_TAG:-latest} - ports: - "127.0.0.1:5984:5984" diff --git a/services/couchdb/Dockerfile b/services/couchdb/Dockerfile index def3692..c990afb 100644 --- a/services/couchdb/Dockerfile +++ b/services/couchdb/Dockerfile @@ -1,3 +1,3 @@ FROM couchdb:latest - +HEALTHCHECK --interval=30s --timeout=10s --start-period=10s --retries=5 CMD curl --fail http://localhost:5984 || exit 1 COPY ./config/* /opt/couchdb/etc/local.d/* \ No newline at end of file