From 95a0609b3b8b5a6065d218223c15a6ffb8f60ec4 Mon Sep 17 00:00:00 2001 From: Denis Gukov Date: Sat, 19 Nov 2022 23:21:26 +0500 Subject: [PATCH] fix(be): db host in docker file --- .github/workflows/release.yml | 2 +- deployment/docker/common/semaphore-wrapper | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 503d1ed9..99ebf7e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/checkout@v3 -# - run: context=prod task docker:test + - run: context=prod task docker:test - uses: docker/setup-qemu-action@v2 diff --git a/deployment/docker/common/semaphore-wrapper b/deployment/docker/common/semaphore-wrapper index ec895b92..1fdf1ae0 100755 --- a/deployment/docker/common/semaphore-wrapper +++ b/deployment/docker/common/semaphore-wrapper @@ -73,10 +73,6 @@ file_env 'SEMAPHORE_ACCESS_KEY_ENCRYPTION' exit 1 } -if [ -n "${SEMAPHORE_DB_PORT}" ]; then - SEMAPHORE_DB_HOST="${SEMAPHORE_DB_HOST}:${SEMAPHORE_DB_PORT}" -fi - # wait on db to be up if [ "${SEMAPHORE_DB_DIALECT}" != 'bolt' ]; then @@ -93,6 +89,10 @@ if [ "${SEMAPHORE_DB_DIALECT}" != 'bolt' ]; then done fi +if [ -n "${SEMAPHORE_DB_PORT}" ]; then + SEMAPHORE_DB_HOST="${SEMAPHORE_DB_HOST}:${SEMAPHORE_DB_PORT}" +fi + case ${SEMAPHORE_DB_DIALECT} in mysql) SEMAPHORE_DB_DIALECT_ID=1;; bolt) SEMAPHORE_DB_DIALECT_ID=2;;