flo/dev-env
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

__devenv

Browse Source
This commit is contained in:
Flo 2024-12-21 02:46:28 +01:00
parent 25a29caf5b
commit fcccfad04a
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/dcom
View File

@ -38,9 +38,11 @@ dcom() {
fi fi
SYSTEM_PATH="$ENV_DIR/systems/$SYSTEM_PATH" SYSTEM_PATH="$ENV_DIR/systems/$SYSTEM_PATH"
SYSTEM_ENV_FILE="$SYSTEM_PATH/.env"
DOCKER_COMPOSE_COMMAND="$@" DOCKER_COMPOSE_COMMAND="$@"
DOCKER_COMPOSE_FILE="$SYSTEM_PATH/docker/docker-compose.yml" DOCKER_COMPOSE_FILE="$SYSTEM_PATH/docker/docker-compose.yml"
# Set .env variables if a file exist
if [[ ! -f "$DOCKER_COMPOSE_FILE" ]]; then if [[ ! -f "$DOCKER_COMPOSE_FILE" ]]; then
denv_error_msg "$DOCKER_COMPOSE_FILE was not found. Have you run init yet?" denv_error_msg "$DOCKER_COMPOSE_FILE was not found. Have you run init yet?"
return 1 return 1
@ -49,5 +51,14 @@ dcom() {
denv_info_msg "System: $SYSTEM_IDENTIFIER" denv_info_msg "System: $SYSTEM_IDENTIFIER"
denv_info_msg "Command: $DOCKER_COMPOSE_COMMAND" denv_info_msg "Command: $DOCKER_COMPOSE_COMMAND"
if [[ -f "$SYSTEM_ENV_FILE" ]] ; then
export $(grep -v '^#' "$SYSTEM_ENV_FILE" | xargs)
fi
docker compose -f "$DOCKER_COMPOSE_FILE" $DOCKER_COMPOSE_COMMAND docker compose -f "$DOCKER_COMPOSE_FILE" $DOCKER_COMPOSE_COMMAND
# Unset .env variables if a file exist
if [[ -f "$SYSTEM_ENV_FILE" ]] ; then
unset $(grep -v '^#' "$SYSTEM_ENV_FILE" | sed -E 's/(.*)=.*/\1/' | xargs)
fi
} }

7
up
View File

@ -1,7 +0,0 @@
#!/bin/bash
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
source $SCRIPT_DIR/bin/drun
docker compose -f "$SCRIPT_DIR/docker/docker-compose.yml" up -d
$SCRIPT_DIR/bin/script/foreachSystem up -d