diff --git a/sites/central_storage/deploy/deploy.sh b/sites/central_storage/deploy/deploy.sh index b380945..8885792 100755 --- a/sites/central_storage/deploy/deploy.sh +++ b/sites/central_storage/deploy/deploy.sh @@ -59,6 +59,7 @@ echo export CODEBASE_ROOT=$CODEBASE_ROOT >> $WORKING_DIR/.env echo export WORKING_DIR=$WORKING_DIR >> $WORKING_DIR/.env cat $COMMON_ENV_FOLDER/.host.env >> $WORKING_DIR/.env cat $ENV_FOLDER/.env >>$WORKING_DIR/.env + DOCKER_COMPOSE_YAML=$WORKING_DIR/docker-compose-$APP_NAME.yaml cp $DW_BASE_DIR/common/docker-compose.yaml $DOCKER_COMPOSE_YAML -u diff --git a/sites/content/deploy/deploy.sh b/sites/content/deploy/deploy.sh index 4837bc6..2f11c80 100755 --- a/sites/content/deploy/deploy.sh +++ b/sites/content/deploy/deploy.sh @@ -1,6 +1,7 @@ #!/bin/bash DW_BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" APP_NAME=content +APP_PARENT_FOLDER=apps PROJECT_NAME=content while [ $# -gt 0 ]; do @@ -28,7 +29,7 @@ fi if git rev-parse --git-dir > /dev/null 2>&1; then # git repo! GIT_REPO_ROOT=$(git rev-parse --show-toplevel) - CODEBASE_ROOT=$GIT_REPO_ROOT/app/$APP_NAME + CODEBASE_ROOT=$GIT_REPO_ROOT/$APP_PARENT_FOLDER/$APP_NAME WORKING_DIR=$GIT_REPO_ROOT/sites/$APP_NAME/deploy else # NOT a git repo! @@ -49,6 +50,9 @@ pushd $WORKING_DIR DW_PUSHD_COUNTER=$((DW_PUSHD_COUNTER + 1)) echo export APP_NAME=$APP_NAME > $WORKING_DIR/.env +echo export GIT_REPO_ROOT=$GIT_REPO_ROOT >> $WORKING_DIR/.env +echo export APP_PARENT_FOLDER=$APP_PARENT_FOLDER >> $WORKING_DIR/.env + cat $COMMON_ENV_FOLDER/.env >> $WORKING_DIR/.env echo export CODEBASE_ROOT=$CODEBASE_ROOT >> $WORKING_DIR/.env echo export WORKING_DIR=$WORKING_DIR >> $WORKING_DIR/.env