Modfify template.

templates/squashkiwi/_backup.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Source common functions
-source "$(dirname "$0")/_dockerhelper.sh"
-source "$(dirname "$0")/_common.sh"
-
-# Load environment variables
-load_env "$1" || die "Failed to load environment variables"
-
-# Get backup file path from second argument
-BACKUP_FILE="$2"
-if [ -z "$BACKUP_FILE" ]; then
-    die "Backup file path not provided"
-fi
-
-# Check if backup file already exists
-if [ -f "$BACKUP_FILE" ]; then
-    die "Backup file $BACKUP_FILE already exists"
-fi
-
-# Stop container before backup
-_stop_container "$CONTAINER_NAME"
-
-# Create backup of data folder
-echo "Creating backup of $DATA_FOLDER..."
-if ! tar zcvf "$BACKUP_FILE" -C "$DATA_FOLDER" .; then
-    _start_container "$CONTAINER_NAME"
-    die "Failed to create backup"
-fi
-
-# Start container after backup
-_start_container "$CONTAINER_NAME"
-
-echo "Backup created successfully: $BACKUP_FILE"

templates/squashkiwi/_common.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source _dockerhelper.sh
-
 # Print error message and exit with code 1
 # Usage: die "error message"
 die() {
@@ -52,12 +50,7 @@ create_and_start_container() {
         _start_container $CONTAINER_NAME
     else
         grey_start
-        docker run -d \
+        $1
-            --restart unless-stopped \
-            --name ${CONTAINER_NAME} \
-            -p ${HOST_PORT}:${CONTAINER_PORT} \
-            -v ${DATA_FOLDER}:/skdata \
-            ${IMAGE_REGISTRY}/${IMAGE_REPO}:${IMAGE_TAG}
         grey_end
     fi
 
@@ -69,3 +62,94 @@ create_and_start_container() {
     echo "Container ${CONTAINER_NAME} is running with ID ${ID}"
 }
 
+function create_folder() {
+    local folder="$1"
+    if [ -d "$folder" ]; then
+        return 0
+    fi
+    if ! mkdir -p "$folder"; then
+        die "Failed to create folder: $folder"
+    fi
+    echo "Folder created: $folder"
+}
+
+
+
+# Check if docker is installed
+_check_docker_installed() {
+    if ! command -v docker &> /dev/null; then
+        echo "Docker is not installed"
+        return 1
+    fi
+
+    # check if docker daemon is running
+    if ! docker info &> /dev/null; then
+        echo "Docker daemon is not running"
+        return 1
+    fi
+
+    # check if user has permission to run docker
+    if ! docker run --rm hello-world &> /dev/null; then
+        echo "User does not have permission to run docker"
+        return 1
+    fi
+
+    return 0
+}
+
+# Check if a container exists
+_is_container_exists() {
+    if ! docker ps -a --format "{{.Names}}" | grep -q "^$1$"; then
+        return 1
+    fi
+    return 0
+}
+
+# Check if a container is running
+_is_container_running() {
+    if ! docker ps --format "{{.Names}}" | grep -q "^$1$"; then
+        return 1
+    fi
+    return 0
+}
+
+# get contianer ID
+_get_container_id() {
+    docker ps --format "{{.ID}}" --filter "name=$1"
+}
+
+# get container status
+_get_container_status() {
+    docker ps --format "{{.Status}}" --filter "name=$1"
+}
+
+# start container that exists
+_start_container() {
+    _is_container_exists $1 || return 1
+    _is_container_running $1 && return 0
+    docker start $1
+}
+
+# stop container that exists
+_stop_container() {
+    _is_container_running $1 || return 0;
+    docker stop $1
+}   
+
+# remove container that exists
+_remove_container() {
+    _stop_container $1
+    _is_container_exists $1 || return 0;
+    docker rm $1
+}
+
+# get container logs
+_get_container_logs() {
+    if ! _is_container_exists $1; then
+        echo "Container $1 does not exist"
+        return 1
+    fi
+
+    docker logs $1
+}
+

templates/squashkiwi/_install.sh

@@ -1,40 +1,20 @@
 #!/bin/bash
-
-# Source common functions
-source "$(dirname "$0")/_dockerhelper.sh"
 source "$(dirname "$0")/_common.sh"
-
+load_env "$1" || die "Failed to load environment variables"
-# Load environment variables
-load_env "$1" || exit 1
 
 # Test Docker 
-if ! _check_docker_installed; then
+_check_docker_installed || die "Docker test failed, aborting installation..."
-    echo "Docker test failed, aborting installation..."
-    exit 1
-fi
-
-function create_folder() {
-    local folder="$1"
-    if ! mkdir -p "$folder"; then
-        die "Failed to create folder: $folder"
-    fi
-}
 
 # Create deploy and data folders
-echo "Ensuring deployment folders exist..."
+create_folder "$LOCAL_DATA_FOLDER/data"
-create_folder "$DEPLOY_FOLDER"
+create_folder "$LOCAL_DATA_FOLDER/backups"
-create_folder "$DATA_FOLDER"
 
 # check can pull image on remote host and exit if fails
-if ! docker pull "$IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG"; then
+docker pull "$IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG" || die "Failed to pull image $IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG"
-    echo "Failed to pull image $IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG"
-    exit 1
-fi
-echo "Successfully pulled the docker image from the registry"
 
 # remove and restart, as the env may have changed.
-_stop_container $CONTAINER_NAME || die "Failed to stop container ${CONTAINER_NAME}"
+./stop.sh || die "Failed to stop container ${CONTAINER_NAME}"
 _remove_container $CONTAINER_NAME || die "Failed to remove container ${CONTAINER_NAME}"
-create_and_start_container || die "Failed to start container ${CONTAINER_NAME}"
+./start.sh || die "Failed to start container ${CONTAINER_NAME}"
 
-echo "Installation complete"
+echo "Installation of ${CONTAINER_NAME} complete"

templates/squashkiwi/_status.sh

@@ -8,16 +8,11 @@ source "$(dirname "$0")/_common.sh"
 load_env "$1" || exit 1
 
 # check if the service is running
-if ! _is_container_running $CONTAINER_NAME; then
+_is_container_running $CONTAINER_NAME || die "Service is not running - did not find container $CONTAINER_NAME."
-    echo "Service is not running - did not find container $CONTAINER_NAME."
-    exit 1
-fi
 
-# curl -s -X GET http://localhost:8080/health | grep -q "OK"
+# check if the service is healthy
-if ! curl -s -X GET http://localhost:${HOST_PORT}/health | grep -q "OK"; then
+curl -s -X GET http://localhost:${HOST_PORT}/health | grep -q "OK" \
-    echo "Service is not healthy - did not get OK response from /health endpoint."
+    || die "Service is not healthy - did not get OK response from /health endpoint."
-    exit 1
-fi
 
 echo "Service is healthy"
 exit 0

templates/squashkiwi/example.env

@@ -7,13 +7,10 @@ CONTAINER_PORT=8181
 HOST_PORT=80
 
 # Deployment settings
-DEPLOY_FOLDER="${HOME}/sk/deploy"
+LOCAL_DATA_FOLDER="${HOME}/.sk"
-DATA_FOLDER="${HOME}/sk/data"
 CONTAINER_NAME="squashkiwi"
 
 # Image settings
 IMAGE_REGISTRY="gitea.jde.nz"
 IMAGE_REPO="squashkiwi/squashkiwi"
 IMAGE_TAG="latest"
-
-

templates/squashkiwi/logs.sh

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

templates/squashkiwi/start.sh

@@ -1,14 +1,11 @@
 #!/bin/bash
-
-# Source common functions
-source "$(dirname "$0")/_dockerhelper.sh"
 source "$(dirname "$0")/_common.sh"
-
-# Load environment variables
 load_env "$1" || die "Failed to load environment variables"
 
-create_and_start_container || die "Failed to start container ${CONTAINER_NAME}"
+create_and_start_container "docker run -d \
-
+            --restart unless-stopped \
-grey_start
+            --name ${CONTAINER_NAME} \
-docker logs --tail 20 "${CONTAINER_NAME}"
+            -p ${HOST_PORT}:${CONTAINER_PORT} \
-grey_end
+            -v ${LOCAL_DATA_FOLDER}/data:/skdata \
+            ${IMAGE_REGISTRY}/${IMAGE_REPO}:${IMAGE_TAG}" 
+    || die "Failed to start container ${CONTAINER_NAME}"

templates/squashkiwi/stop.sh

@@ -1,14 +1,5 @@
 #!/bin/bash
-
-# Source common functions
-source "$(dirname "$0")/_dockerhelper.sh"
 source "$(dirname "$0")/_common.sh"
-
-# Load environment variables
 load_env "$1" || die "Failed to load environment variables"
 
 _stop_container $CONTAINER_NAME || die "Failed to stop container ${CONTAINER_NAME}"
-
-grey_start
-docker logs --tail 20 "${CONTAINER_NAME}"
-grey_end