.gitignore

@@ -1,11 +1,7 @@
 bin/cron/
-
+var/
-docker/letsencrypt*
-docker/docker-compose.yml
 
 systems/*
 
-var/
 
-.alias
+script/clone
-.systems

.systems

@@ -5,5 +5,5 @@
 #
 # LIKE CRON - THE FILE HAS TO END WITH AN EMPTY LINE
 #
-backend template/backend ssh://git@docker.local:222/flo/template-backend.git
+backend weedkeeper/backend ssh://git@docker.local:222/flo/weedkeeper-backend.git
-frontend template/frontend ssh://git@docker.local:222/flo/template-frontend.git
+frontend weedkeeper/frontend ssh://git@docker.local:222/flo/weedkeeper-frontend.git

build

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-source $ENV_DIR/bin/denv_msg
 
-denv_info_msg "Executing build dev-env"
+source $SCRIPT_DIR/bin/denv
-docker compose -f "$ENV_DIR/docker/docker-compose.yml" build
+source $SCRIPT_DIR/bin/dexec
-echo ""
+source $SCRIPT_DIR/bin/drun
 
-$ENV_DIR/script/foreachSystem/dcom build
+denvexec build
+$SCRIPT_DIR/bin/script/foreachSystem build

docker/.gitignore

@@ -0,0 +1,3 @@
+letsencrypt/*
+docker-compose-mac.yml
+docker-compose.yml

down

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-source $ENV_DIR/bin/denv_msg
 
-denv_info_msg "Executing down dev-env"
+source $SCRIPT_DIR/bin/denv
-docker compose -f "$ENV_DIR/docker/docker-compose.yml" down
+source $SCRIPT_DIR/bin/dexec
-echo ""
+source $SCRIPT_DIR/bin/drun
 
-$ENV_DIR/script/foreachSystem/dcom down
+$SCRIPT_DIR/bin/script/foreachSystem down
+denvexec down

init

@@ -1,12 +1,10 @@
 #!/bin/bash
 ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-source $ENV_DIR/bin/denv_msg
 
 # Check docker-compose.yml file
 if [ ! -f "$ENV_DIR/docker/docker-compose.yml" ]
 then
     cp "$ENV_DIR/docker/docker-compose.yml.dist" "$ENV_DIR/docker/docker-compose.yml"
-    denv_info_msg "[dev-env]: docker-compose.yml created"
 fi
 
 # Update .profile
@@ -18,4 +16,4 @@ $ENV_DIR/script/clone
 echo ""
 
 # Run init for all systems
-$ENV_DIR/script/foreachSystem/runScript init
+./script/foreachSystem init

script/clone

@@ -1,34 +0,0 @@
-#!/bin/bash
-ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd )
-CONFIG_FILE="$ENV_DIR/.systems"
-source $ENV_DIR/bin/denv_msg
-
-# Check if .systems configuration exists
-if [ ! -f "$CONFIG_FILE" ]; then
-  denv_error_msg "$CONFIG_FILE not found."
-  exit 1
-fi
-
-denv_info_msg "[dev-env]: Cloning all systems defined in $CONFIG_FILE"
-
-# Iterate through all lines in .systems configuration
-while IFS=' ' read -r IDENTIFIER DIRECTORY GIT; do
-  # Skip comments and emtpy lines
-  if [[ "$IDENTIFIER" =~ ^#.* ]] || [ -z "$IDENTIFIER" ]; then
-    continue
-  fi
-
-  denv_info_msg "System $IDENTIFIER"
-
-  DIRECTORY="systems/$DIRECTORY"
-
-  # Check if system directory already exists
-  if [ ! -d "$DIRECTORY" ]; then
-    denv_info_msg "Clone into directory '$DIRECTORY'..."
-    git clone "$GIT" "$DIRECTORY"
-    denv_success_msg "Successfully cloned $IDENTIFIER"
-  else
-    denv_echo_msg "Directory '$DIRECTORY' already exists. Skipping..."
-  fi
-  echo ""
-done < "$CONFIG_FILE"

script/foreachSystem

@@ -1,6 +1,6 @@
 #!/bin/bash
 COMMAND="$@"
-ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/../.." &> /dev/null && pwd )
+ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd )
 CONFIG_FILE="$ENV_DIR/.systems"
 
 source $ENV_DIR/bin/denv_msg

script/foreachSystem/dcom

@@ -1,24 +0,0 @@
-#!/bin/bash
-ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/../.." &> /dev/null && pwd )
-source $ENV_DIR/bin/denv_msg
-source $ENV_DIR/bin/dcom
-
-COMMAND="$@"
-CONFIG_FILE="$ENV_DIR/.systems"
-
-# Check if .systems configuration exists
-if [ ! -f "$CONFIG_FILE" ]; then
-  denv_error_msg "$CONFIG_FILE not found."
-  exit 1
-fi
-
-denv_info_msg "Executing $COMMAND for all systems defined in $CONFIG_FILE"
-
-while IFS=' ' read -r IDENTIFIER DIRECTORY GIT; do # Iterate through all lines in .systems configuration
-  if [[ "$IDENTIFIER" =~ ^#.* ]] || [ -z "$IDENTIFIER" ]; then # Skip comments and emtpy lines
-    continue
-  fi
-
-  dcom $IDENTIFIER $COMMAND
-  echo ""
-done < "$CONFIG_FILE"

stop

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-source $ENV_DIR/bin/denv_msg
 
-denv_info_msg "Executing stop dev-env"
+source $SCRIPT_DIR/bin/denv
-docker compose -f "$ENV_DIR/docker/docker-compose.yml" stop
+source $SCRIPT_DIR/bin/dexec
-echo ""
+source $SCRIPT_DIR/bin/drun
 
-$ENV_DIR/script/foreachSystem/dcom stop
+$SCRIPT_DIR/bin/script/foreachSystem stop
+denvexec stop

up

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-source $ENV_DIR/bin/denv_msg
-
-denv_info_msg "Executing up -d dev-env"
-docker compose -f "$ENV_DIR/docker/docker-compose.yml" up -d
-echo ""
-
-$ENV_DIR/script/foreachSystem/dcom up -d

update

@@ -1,5 +1,33 @@
 #!/bin/bash
-ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-# Run update for all systems
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-$ENV_DIR/script/foreachSystem/runScript update
+
+source $SCRIPT_DIR/bin/denv
+source $SCRIPT_DIR/bin/dexec
+source $SCRIPT_DIR/bin/drun
+
+EXIT=0
+
+# Check docker-compose.yml file
+if [ ! -f "$SCRIPT_DIR/docker/docker-compose.yml" ]
+then
+    cp "$SCRIPT_DIR/docker/docker-compose.yml.dist" "$SCRIPT_DIR/docker/docker-compose.yml"
+    EXIT=1
+fi
+
+# Check docker-compose-mac.yml file
+if [ ! -f "$SCRIPT_DIR/docker/docker-compose-mac.yml" ]
+then
+    cp "$SCRIPT_DIR/docker/docker-compose-mac.yml.dist" "$SCRIPT_DIR/docker/docker-compose-mac.yml"
+    EXIT=1
+fi
+
+
+if [ $EXIT -eq 1 ]
+then
+    echo "docker-compose files created, please change variables and call update again"
+    exit 1
+fi
+
+denvexec up -d
+$SCRIPT_DIR/bin/script/foreachSystem update