biiig wrench

templates/watchtower/install.sh

@@ -1,20 +1,25 @@
 #!/bin/bash
-source "$(dirname "$0")/_common.sh"
+source "${AGENT_PATH}/_common.sh"
 
-# Required environment variables
-check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG"
+# Watchtower Install Script
 
-# Test Docker 
-_check_docker_installed || die "Docker test failed, aborting installation..."
 
-# check can pull image on remote host and exit if fails
-echo "Pulling image ${IMAGE_REGISTRY}/${IMAGE_REPO}:${IMAGE_TAG}"
-docker pull "$IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG" || die "Failed to pull image $IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG"
+# Load service environment variables
+source ./service.env
+_check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG"
 
-# remove and restart, as the env may have changed.
-echo "Removing old container ${CONTAINER_NAME}"
-_remove_container $CONTAINER_NAME || die "Failed to remove container ${CONTAINER_NAME}"
-echo "Starting container ${CONTAINER_NAME}"
-bash ./start.sh $1 || die "Failed to start container ${CONTAINER_NAME}"
+echo "Checking Docker installation..."
+_check_docker_installed || _die "Docker test failed, aborting installation..."
 
-echo "Installation of ${CONTAINER_NAME} complete"
+echo "Pulling image ${IMAGE_REGISTRY}/${IMAGE_REPO}:${IMAGE_TAG}..."
+docker pull "$IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG" || _die "Failed to pull image $IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG"
+
+echo "Stopping and removing any existing container..."
+# No need to check failure, might not exist
+_stop_container $CONTAINER_NAME
+_remove_container $CONTAINER_NAME || _die "Failed to remove container ${CONTAINER_NAME}"
+
+echo "Starting container..."
+bash ./start.sh $1 || _die "Failed to start container ${CONTAINER_NAME}"
+
+echo "Installation complete for service ${CONTAINER_NAME}."

templates/watchtower/logs.sh

@@ -1,10 +1,14 @@
 #!/bin/bash
-source "$(dirname "$0")/_common.sh"
+source "${AGENT_PATH}/_common.sh"
 
-# Required environment variables
-check_required_env_vars "CONTAINER_NAME"
+# Watchtower Logs Script
 
-echo "Container ${CONTAINER_NAME} logs:"
-grey_start
-docker logs "${CONTAINER_NAME}"
-grey_end
+
+# Load service environment variables
+source ./service.env
+_check_required_env_vars "CONTAINER_NAME"
+
+echo "Showing logs for ${CONTAINER_NAME}... (Press Ctrl+C to stop)"
+_grey_start
+_get_container_logs $CONTAINER_NAME
+_grey_end

templates/watchtower/start.sh

@@ -1,28 +1,38 @@
 #!/bin/bash
-source "$(dirname "$0")/_common.sh"
+source "${AGENT_PATH}/_common.sh"
 
-SERVICE_CONFIG_DIR="$1"
+# Watchtower Start Script
 
-# Required environment variables
-check_required_env_vars "CONTAINER_NAME" "INTERVAL"
+
+# Load service environment variables
+source ./service.env
+_check_required_env_vars "CONTAINER_NAME" "INTERVAL"
+
+# Optional arguments (e.g., --cleanup, --monitor-only)
+EXTRA_ARGS=$1
 
 DOCKER_RUN_CMD="docker run -d \
-                --restart unless-stopped \
-                --name ${CONTAINER_NAME} \
-                -v /var/run/docker.sock:/var/run/docker.sock \
-                -v ${SERVICE_CONFIG_DIR}/config.json:/config.json
-                ${IMAGE_REGISTRY}/${IMAGE_REPO}:${IMAGE_TAG} \
-                --interval ${INTERVAL}"
+    --name ${CONTAINER_NAME} \
+    --restart=always \
+    -v /var/run/docker.sock:/var/run/docker.sock \
+    ${IMAGE_REGISTRY}/${IMAGE_REPO}:${IMAGE_TAG} \
+    --interval ${INTERVAL} ${EXTRA_ARGS}"
 
-if ! create_and_start_container "$DOCKER_RUN_CMD" "$CONTAINER_NAME"; then
-    echo "RUN_CMD failed:"
-    echo "$DOCKER_RUN_CMD"
-    die "Failed to start container ${CONTAINER_NAME}"
+echo "Starting container ${CONTAINER_NAME}..."
+
+if ! _create_and_start_container "$DOCKER_RUN_CMD" "$CONTAINER_NAME"; then
+    # If creation/start failed, attempt to display logs if container exists
+    if _is_container_exists $CONTAINER_NAME; then
+        echo "Attempting to get logs from failed container..."
+        _get_container_logs $CONTAINER_NAME
+    fi
+    _die "Failed to start container ${CONTAINER_NAME}"
 fi
 
-# Check if the container is running
+# Check if the container is running after successful start command
 if ! _is_container_running "$CONTAINER_NAME"; then
-    die "Container ${CONTAINER_NAME} is not running"
+     _get_container_logs $CONTAINER_NAME # Show logs if it immediately exited
+    _die "Container ${CONTAINER_NAME} is not running after start attempt"
 fi
 
-echo "Container ${CONTAINER_NAME} started"
+echo "Service ${CONTAINER_NAME} started successfully."

templates/watchtower/status.sh

@@ -1,14 +1,17 @@
 #!/bin/bash
-source "$(dirname "$0")/_common.sh"
+source "${AGENT_PATH}/_common.sh"
 
-# Required environment variables
-check_required_env_vars "CONTAINER_NAME"
+# Watchtower Status Script
 
-# check if the service is running
-_is_container_running $CONTAINER_NAME || die "Service is not running - did not find container $CONTAINER_NAME."
 
-# check if the service is healthy
-# curl -s -X GET http://localhost:${HOST_PORT}/health | grep -q "OK" \
-#     || die "Service is not healthy - did not get OK response from /health endpoint."
+# Load service environment variables
+source ./service.env
+_check_required_env_vars "CONTAINER_NAME"
 
-echo "Service is healthy"
+_is_container_running $CONTAINER_NAME || _die "Service is not running - did not find container $CONTAINER_NAME."
+
+# Optional: Add specific health checks for Watchtower if needed.
+# For example, check logs for recent activity or errors.
+
+echo "Service ${CONTAINER_NAME} is running."
+exit 0

templates/watchtower/stop.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
-source "$(dirname "$0")/_common.sh"
+source "${AGENT_PATH}/_common.sh"
 
-# Required environment variables
-check_required_env_vars "CONTAINER_NAME"
+# Watchtower Stop Script
 
-_stop_container $CONTAINER_NAME || die "Failed to stop container ${CONTAINER_NAME}"
 
-echo "Container ${CONTAINER_NAME} stopped"
+# Load service environment variables
+source ./service.env
+_check_required_env_vars "CONTAINER_NAME"
+
+echo "Stopping service ${CONTAINER_NAME}..."
+_stop_container $CONTAINER_NAME || _die "Failed to stop container ${CONTAINER_NAME}"
+echo "Service ${CONTAINER_NAME} stopped."

templates/watchtower/uninstall.sh

@@ -1,13 +1,17 @@
 #!/bin/bash
-source "$(dirname "$0")/_common.sh"
+source "${AGENT_PATH}/_common.sh"
 
-# Required environment variables
-check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG"
+# Watchtower Uninstall Script
 
-_remove_container $CONTAINER_NAME || die "Failed to remove container ${CONTAINER_NAME}"
 
-# remove the image
-docker rmi "$IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG" || echo "Failed to remove image $IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG"
+# Load service environment variables
+source ./service.env
+_check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG"
 
-echo "Uninstallation of ${CONTAINER_NAME} complete."
+echo "Uninstalling service ${CONTAINER_NAME}..."
+_remove_container $CONTAINER_NAME || _die "Failed to remove container ${CONTAINER_NAME}"
+
+echo "Service ${CONTAINER_NAME} uninstalled."
+
+# Note: Watchtower doesn't typically have volumes to nuke.