From fe3cc6c03151b0dfeeef22f9dbae1411cf61aaa0 Mon Sep 17 00:00:00 2001 From: fiftin Date: Mon, 27 May 2024 23:00:47 +0200 Subject: [PATCH] ci(docker): use full path of venv --- .github/workflows/release.yml | 8 ++------ deployment/docker/runner/runner-wrapper | 2 +- deployment/docker/server/server-wrapper | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8791880c..7532b5bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -85,9 +85,7 @@ jobs: org.opencontainers.image.vendor=SemaphoreUI maintainer=Semaphore UI tags: | - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} + type=raw,value=${{ github.ref_name }} flavor: | latest=true @@ -113,9 +111,7 @@ jobs: org.opencontainers.image.vendor=SemaphoreUI maintainer=Semaphore UI tags: | - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} + type=raw,value=${{ github.ref_name }} flavor: | latest=true diff --git a/deployment/docker/runner/runner-wrapper b/deployment/docker/runner/runner-wrapper index 8fefd29e..1fa49cac 100644 --- a/deployment/docker/runner/runner-wrapper +++ b/deployment/docker/runner/runner-wrapper @@ -6,7 +6,7 @@ export SEMAPHORE_CONFIG_PATH="${SEMAPHORE_CONFIG_PATH:-/etc/semaphore}" export SEMAPHORE_TMP_PATH="${SEMAPHORE_TMP_PATH:-/tmp/semaphore}" export ANSIBLE_CONFIG="${ANSIBLE_CONFIG:-${SEMAPHORE_TMP_PATH}/ansible.cfg}" -source ./venv/bin/activate +source /home/semaphore/venv/bin/activate if test -f "${SEMAPHORE_CONFIG_PATH}/packages.txt"; then echoerr "Installing additional system dependencies" diff --git a/deployment/docker/server/server-wrapper b/deployment/docker/server/server-wrapper index 22fee465..c5415ee2 100755 --- a/deployment/docker/server/server-wrapper +++ b/deployment/docker/server/server-wrapper @@ -181,7 +181,7 @@ EOF fi fi -source ./venv/bin/activate +source /home/semaphore/venv/bin/activate if test -f "${SEMAPHORE_CONFIG_PATH}/packages.txt"; then echoerr "Installing additional system dependencies"