From 98e6213fa1b11080c56fdef4caa23c05c704d5e5 Mon Sep 17 00:00:00 2001 From: valere Date: Mon, 2 Feb 2026 21:21:00 +0100 Subject: [PATCH] sub domain deploy for branches 22 --- .github/workflows/deploy.yml | 4 ---- .github/workflows/setup-env.sh | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d0b420e..0083950 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,6 @@ jobs: run: | bash ./.github/workflows/setup-env.sh set -a && source .env && set +a - echo $APP_NAME if [ -n "$APP_NAME" ]; then bash /var/docker-web/src/cli.sh down "${APP_NAME}" rm -rf "$APP_DIR" @@ -22,8 +21,6 @@ jobs: export COMPOSE_BAKE=false docker rmi "local/${APP_NAME}" 2>/dev/null || true bash /var/docker-web/src/cli.sh build "${APP_NAME}" - else - echo 'ho no' fi deploy: @@ -38,7 +35,6 @@ jobs: run: | bash ./.github/workflows/setup-env.sh set -a && source .env && set +a - echo $APP_NAME if [ -n "$APP_NAME" ]; then bash /var/docker-web/src/cli.sh up "${APP_NAME}" fi diff --git a/.github/workflows/setup-env.sh b/.github/workflows/setup-env.sh index 68ae101..73cffb1 100755 --- a/.github/workflows/setup-env.sh +++ b/.github/workflows/setup-env.sh @@ -26,7 +26,9 @@ if [ "$BRANCH_NAME" != "main" ] && [ "$BRANCH_NAME" != "master" ]; then sed -i "s|${GITHUB_REPOSITORY##*/}|$APP_NAME|g" docker-compose.yml fi +APP_DIR="/var/docker-web/apps/$APP_NAME" + changeEnvVar "DOMAIN" $DOMAIN changeEnvVar "APP_NAME" $APP_NAME changeEnvVar "PORT" $PORT -changeEnvVar "APP_DIR" "/var/docker-web/apps/$APP_NAME" +changeEnvVar "APP_DIR" $APP_DIR