From a48cd4049d563e734caf34b2b08206c9b929d9c4 Mon Sep 17 00:00:00 2001 From: valere Date: Mon, 2 Feb 2026 20:39:09 +0100 Subject: [PATCH] sub domain deploy for branches 13 --- .github/workflows/deploy.yml | 19 ++++++++----------- .github/workflows/setup-env.sh | 2 -- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8a38d6e..f178c79 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,16 +13,13 @@ jobs: run: ./.github/workflows/setup-env.sh - name: Build app run: | - set -a && source .env && set +a - cat .env - echo $APP_NAME - # bash /var/docker-web/src/cli.sh down "${APP_NAME}" - # rm -rf "$APP_DIR" - # mkdir "$APP_DIR" - # cp -a $(find . -mindepth 1 -maxdepth 1 ! -name '.git' ! -name 'node_modules') "$APP_DIR/" - # export COMPOSE_BAKE=false - # docker rmi "local/${APP_NAME}" 2>/dev/null || true - # bash /var/docker-web/src/cli.sh build "${APP_NAME}" + bash /var/docker-web/src/cli.sh down "${APP_NAME}" + rm -rf "$APP_DIR" + mkdir "$APP_DIR" + cp -a $(find . -mindepth 1 -maxdepth 1 ! -name '.git' ! -name 'node_modules') "$APP_DIR/" + export COMPOSE_BAKE=false + docker rmi "local/${APP_NAME}" 2>/dev/null || true + bash /var/docker-web/src/cli.sh build "${APP_NAME}" deploy: runs-on: ubuntu-22.04 @@ -37,4 +34,4 @@ jobs: - name: Deploy run: | set -a && source .env && set +a - # bash /var/docker-web/src/cli.sh up "${APP_NAME}" + bash /var/docker-web/src/cli.sh up "${APP_NAME}" diff --git a/.github/workflows/setup-env.sh b/.github/workflows/setup-env.sh index 243fd00..c579455 100755 --- a/.github/workflows/setup-env.sh +++ b/.github/workflows/setup-env.sh @@ -32,5 +32,3 @@ changeEnvVar "PORT" $PORT changeEnvVar "APP_DIR" "/var/docker-web/apps/$APP_NAME" set -a && source .env && set +a -cat docker-compose.yml -echo $APP_NAME