sub domain deploy for branches 21

.github/workflows/deploy.yml

@@ -12,9 +12,9 @@ jobs:
       - name: Build app
         run: |
           bash ./.github/workflows/setup-env.sh
+          set -a && source .env && set +a
           echo $APP_NAME
           if [ -n "$APP_NAME" ]; then
-            set -a && source .env && set +a
             bash /var/docker-web/src/cli.sh down "${APP_NAME}"
             rm -rf "$APP_DIR"
             mkdir "$APP_DIR"
@@ -37,8 +37,8 @@ jobs:
       - name: Deploy
         run: |
           bash ./.github/workflows/setup-env.sh
+          set -a && source .env && set +a
           echo $APP_NAME
           if [ -n "$APP_NAME" ]; then
-            set -a && source .env && set +a
             bash /var/docker-web/src/cli.sh up "${APP_NAME}"
           fi

.github/workflows/setup-env.sh

@@ -30,5 +30,3 @@ changeEnvVar "DOMAIN" $DOMAIN
 changeEnvVar "APP_NAME" $APP_NAME
 changeEnvVar "PORT" $PORT
 changeEnvVar "APP_DIR" "/var/docker-web/apps/$APP_NAME"
-
-set -a && source .env && set +a