Big Refactor

templates/watchtower/_common.sh

@@ -14,41 +14,6 @@ die() {
     exit 1
 }
 
-# Load environment variables from .env file
-# Usage: load_env [path_to_env_file]
-# If no path is provided, looks for .env in the same directory as the script
-load_env() {
-    local script_dir="$(dirname "${BASH_SOURCE[0]}")"
-    local env_file
-
-    # first load basic.env for the template defaults
-    if [ -f "$script_dir/_basic.env" ]; then
-        set -a
-        source "$script_dir/_basic.env"
-        set +a
-    else
-        echo "Warning: _basic.env file not found at $script_dir/_basic.env. Broken template?"
-        return 1
-    fi
-
-    # now load the server specific env file
-    if [ -z "$1" ]; then
-        echo "Usage: $0 [path_to_env_file]"
-        return 1
-    fi
-
-    env_file="$1/service.env"    
-
-    if [ ! -f "$env_file" ]; then
-        echo "Warning: service.env file not found at $1"
-        return 1
-    fi
-
-    set -a
-    source "$env_file"
-    set +a
-}
-
 grey_start() {
     echo -e -n "\033[90m"
 }

templates/watchtower/install.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 source "$(dirname "$0")/_common.sh"
-load_env "$1" || die "Failed to load environment variables"
 
 # Required environment variables
 check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG"

templates/watchtower/logs.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
 source "$(dirname "$0")/_common.sh"
-load_env "$1" || die "Failed to load environment variables"
 
 # Required environment variables
 check_required_env_vars "CONTAINER_NAME"
 
 echo "Container ${CONTAINER_NAME} logs:"
 grey_start
-docker logs --tail 100 "${CONTAINER_NAME}"
+docker logs "${CONTAINER_NAME}"
 grey_end

templates/watchtower/start.sh

@@ -2,7 +2,6 @@
 source "$(dirname "$0")/_common.sh"
 
 SERVICE_CONFIG_DIR="$1"
-load_env "$SERVICE_CONFIG_DIR" || die "Failed to load environment variables"
 
 # Required environment variables
 check_required_env_vars "CONTAINER_NAME" "INTERVAL"

templates/watchtower/status.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 source "$(dirname "$0")/_common.sh"
-load_env "$1" || die "Failed to load environment variables"
 
 # Required environment variables
 check_required_env_vars "CONTAINER_NAME"

templates/watchtower/stop.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 source "$(dirname "$0")/_common.sh"
-load_env "$1" || die "Failed to load environment variables"
 
 # Required environment variables
 check_required_env_vars "CONTAINER_NAME"

templates/watchtower/uninstall.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 source "$(dirname "$0")/_common.sh"
-load_env "$1" || die "Failed to load environment variables"
 
 # Required environment variables
 check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG"