Add 1 and update 13 files
All checks were successful
Test and Publish Templates / test-and-publish (push) Successful in 38s

This commit is contained in:
j
2025-12-28 10:48:00 +13:00
parent 2138528790
commit d07dd8236f
14 changed files with 21 additions and 12 deletions

View File

@@ -16,7 +16,8 @@ bash ./stop.sh 2>/dev/null || true
# Generate configuration # Generate configuration
echo "Generating configuration..." echo "Generating configuration..."
export HOSTNAME=$(hostname) HOSTNAME=$(hostname)
export HOSTNAME
bash "$SCRIPT_DIR/scripts/generate-config.sh" || _die "Failed to generate configuration" bash "$SCRIPT_DIR/scripts/generate-config.sh" || _die "Failed to generate configuration"
# Start the client # Start the client

View File

@@ -0,0 +1,7 @@
# Template identifier - MUST match the directory name
TEMPLATE=simple-logs
# Requirements
REQUIRES_HOST_ROOT=false
REQUIRES_DOCKER=true
REQUIRES_DOCKER_ROOT=false

View File

@@ -40,7 +40,7 @@ if [ -z "$SYSTEM_TYPE" ]; then
echo " Hardware: Mac Mini" echo " Hardware: Mac Mini"
fi fi
fi fi
elif [ "$ID" = "raspbian" ] || [ "$ID" = "debian" ] && [ "$(uname -m)" = "aarch64" -o "$(uname -m)" = "armv7l" ]; then elif { [ "$ID" = "raspbian" ] || [ "$ID" = "debian" ]; } && { [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "armv7l" ]; }; then
SYSTEM_TYPE="rpi" SYSTEM_TYPE="rpi"
echo " Detected: Raspberry Pi OS" echo " Detected: Raspberry Pi OS"
fi fi

View File

@@ -181,7 +181,7 @@ fi
BASHRC BASHRC
if [ "${ENABLE_WATCHDOG}" = "true" ]; then if [ "${ENABLE_WATCHDOG}" = "true" ]; then
echo '~/watchdog.sh &' >> /tmp/bashrc_append echo '$HOME/watchdog.sh &' >> /tmp/bashrc_append
fi fi
host_exec sh -c "cat /tmp/bashrc_append >> /home/${KIOSK_USER}/.bashrc" host_exec sh -c "cat /tmp/bashrc_append >> /home/${KIOSK_USER}/.bashrc"

View File

@@ -11,7 +11,7 @@ _check_docker_installed || _die "Docker test failed"
echo "Building squashthumbnailmaker Docker image..." echo "Building squashthumbnailmaker Docker image..."
# Build the Docker image locally # Build the Docker image locally
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR" || _die "Failed to change to script directory"
docker build -t "${CONTAINER_NAME}_image:latest" . || _die "Failed to build Docker image" docker build -t "${CONTAINER_NAME}_image:latest" . || _die "Failed to build Docker image"
echo "Installation of ${CONTAINER_NAME} complete" echo "Installation of ${CONTAINER_NAME} complete"

View File

@@ -11,6 +11,7 @@ fi
echo "Starting Tailscale container..." echo "Starting Tailscale container..."
# Determine if we should use userspace networking # Determine if we should use userspace networking
# shellcheck disable=SC2034 # Reserved for future network mode options
NETWORK_MODE="" NETWORK_MODE=""
CAP_ADD="" CAP_ADD=""
DEVICE_MOUNT="" DEVICE_MOUNT=""

View File

@@ -8,7 +8,7 @@ _check_required_env_vars "CONTAINER_NAME" "DATA_PATH" "DB_NAME" "DB_USER"
# Export variables for docker compose # Export variables for docker compose
export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR" || _die "Failed to change to script directory"
# Dump PostgreSQL database before backup # Dump PostgreSQL database before backup
echo "Dumping PostgreSQL database..." echo "Dumping PostgreSQL database..."

View File

@@ -9,7 +9,7 @@ export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER
echo "WARNING: This will PERMANENTLY DELETE all data for ${CONTAINER_NAME}" echo "WARNING: This will PERMANENTLY DELETE all data for ${CONTAINER_NAME}"
echo "This includes all wiki pages, users, database, and configuration!" echo "This includes all wiki pages, users, database, and configuration!"
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR" || _die "Failed to change to script directory"
# Stop and remove containers # Stop and remove containers
docker compose down -v 2>/dev/null || true docker compose down -v 2>/dev/null || true

View File

@@ -27,7 +27,7 @@ EOF
# Export variables for docker compose # Export variables for docker compose
export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR" || _die "Failed to change to script directory"
# Pull images # Pull images
docker compose pull || _die "Failed to pull images" docker compose pull || _die "Failed to pull images"

View File

@@ -6,7 +6,7 @@ _check_required_env_vars "CONTAINER_NAME"
# Export variables for docker compose # Export variables for docker compose
export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR" || _die "Failed to change to script directory"
echo "Container ${CONTAINER_NAME} logs:" echo "Container ${CONTAINER_NAME} logs:"
_grey_start _grey_start

View File

@@ -8,7 +8,7 @@ _check_required_env_vars "CONTAINER_NAME" "DATA_PATH" "DB_NAME" "DB_USER"
# Export variables for docker compose # Export variables for docker compose
export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR" || _die "Failed to change to script directory"
# Stop and remove containers before restore # Stop and remove containers before restore
docker compose down docker compose down

View File

@@ -6,7 +6,7 @@ _check_required_env_vars "CONTAINER_NAME" "DATA_PATH"
# Export variables for docker compose # Export variables for docker compose
export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR" || _die "Failed to change to script directory"
docker compose up -d || _die "Failed to start containers" docker compose up -d || _die "Failed to start containers"
echo "Container ${CONTAINER_NAME} started" echo "Container ${CONTAINER_NAME} started"

View File

@@ -6,7 +6,7 @@ _check_required_env_vars "CONTAINER_NAME"
# Export variables for docker compose # Export variables for docker compose
export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR" || _die "Failed to change to script directory"
docker compose stop || _die "Failed to stop containers" docker compose stop || _die "Failed to stop containers"
echo "Container ${CONTAINER_NAME} stopped" echo "Container ${CONTAINER_NAME} stopped"

View File

@@ -6,7 +6,7 @@ _check_required_env_vars "CONTAINER_NAME"
# Export variables for docker compose # Export variables for docker compose
export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR" || _die "Failed to change to script directory"
# Stop and remove containers (but preserve volumes/data) # Stop and remove containers (but preserve volumes/data)
docker compose down || _die "Failed to stop containers" docker compose down || _die "Failed to stop containers"