diff --git a/.github/scripts/setup-env.sh b/.github/scripts/setup-env.sh deleted file mode 100644 index c2f5e2b..0000000 --- a/.github/scripts/setup-env.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -set -e # Arrête le script en cas d'erreur - -# Charge les variables d'environnement -set -a && source .env && set +a - -# Variables GitHub -REPO_NAME="${GITHUB_REPOSITORY##*/}" -BRANCH_NAME=$GITHUB_REF_NAME - -# Configuration pour les branches non-principales -if [ "$BRANCH_NAME" != "main" ] && [ "$BRANCH_NAME" != "master" ]; then - sed -i "s/DOMAIN=.*/DOMAIN=$BRANCH_NAME.$DOMAIN/" .env - sed -i "s/container_name: evilspins/container_name: $BRANCH_NAME.$DOMAIN/" docker-compose.yml - REPO_NAME=$BRANCH_NAME.$DOMAIN -fi - -APP_DIR="/var/docker-web/apps/$REPO_NAME" - -# Recharge les variables après modification -set -a && source .env && set +a - -# Exporte pour les steps suivants -echo "REPO_NAME=$REPO_NAME" >> $GITHUB_ENV -echo "APP_DIR=$APP_DIR" >> $GITHUB_ENV -echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV diff --git a/.github/workflows/setup-env.sh b/.github/workflows/setup-env.sh index 9fe2136..243fd00 100755 --- a/.github/workflows/setup-env.sh +++ b/.github/workflows/setup-env.sh @@ -21,7 +21,7 @@ BRANCH_NAME=$GITHUB_REF_NAME # Configuration pour les branches non-principales if [ "$BRANCH_NAME" != "main" ] && [ "$BRANCH_NAME" != "master" ]; then DOMAIN="$BRANCH_NAME.$DOMAIN" - APP_NAME="$BRANCH_NAME_$APP_NAME" + APP_NAME="${BRANCH_NAME}_${APP_NAME}" PORT=$(bash /var/docker-web/src/cli.sh ALLOCATE_PORT) sed -i "s|${GITHUB_REPOSITORY##*/}|$APP_NAME|g" docker-compose.yml fi @@ -32,5 +32,5 @@ changeEnvVar "PORT" $PORT changeEnvVar "APP_DIR" "/var/docker-web/apps/$APP_NAME" set -a && source .env && set +a -cat .env +cat docker-compose.yml echo $APP_NAME