From 8e2bc35781145a92712d5b8cea749f45687cfa79 Mon Sep 17 00:00:00 2001 From: S Date: Mon, 2 Mar 2026 11:42:52 -0500 Subject: [PATCH] fix: update phase1_gitea_unraid.sh to include UNRAID_COMPOSE_DIR for docker-compose handling --- phase1_gitea_unraid.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/phase1_gitea_unraid.sh b/phase1_gitea_unraid.sh index 1d3e105..7533c20 100755 --- a/phase1_gitea_unraid.sh +++ b/phase1_gitea_unraid.sh @@ -11,7 +11,7 @@ source "${SCRIPT_DIR}/lib/common.sh" load_env require_vars UNRAID_IP UNRAID_SSH_USER UNRAID_SSH_PORT UNRAID_GITEA_DATA_PATH \ - UNRAID_GITEA_IP \ + UNRAID_COMPOSE_DIR UNRAID_GITEA_IP \ GITEA_ADMIN_USER GITEA_ADMIN_PASSWORD GITEA_ADMIN_EMAIL \ GITEA_ORG_NAME GITEA_INSTANCE_NAME \ GITEA_DB_TYPE GITEA_VERSION GITEA_DOMAIN @@ -27,6 +27,8 @@ phase_header 1 "Gitea on Unraid" # Templates use $DATA_PATH as a generic variable name so the same template # works for both Unraid (Phase 1) and Fedora (Phase 2). DATA_PATH="$UNRAID_GITEA_DATA_PATH" +# Compose files live in a centralized project directory on each host. +COMPOSE_DIR="${UNRAID_COMPOSE_DIR}/gitea" # Reuse Unraid's existing custom network. UNRAID_DOCKER_NETWORK_NAME="br0" @@ -60,9 +62,10 @@ fi # Step 3: Render + SCP docker-compose file # --------------------------------------------------------------------------- log_step 3 "Deploying docker-compose.yml..." -if ssh_exec UNRAID "test -f '${DATA_PATH}/docker-compose.yml'"; then +if ssh_exec UNRAID "test -f '${COMPOSE_DIR}/docker-compose.yml'"; then log_info "docker-compose.yml already exists — skipping" else + ssh_exec UNRAID "mkdir -p '${COMPOSE_DIR}'" TMPFILE=$(mktemp) # Set variables for template — containers get dedicated LAN IPs via macvlan GITEA_CONTAINER_IP="${UNRAID_GITEA_IP}" @@ -84,9 +87,9 @@ else "\${GITEA_VERSION} \${DATA_PATH} \${GITEA_CONTAINER_IP} \${GITEA_NETWORK_NAME} \${DB_DOCKER_IMAGE} \${DB_ENV_VARS} \${DB_DATA_DIR} \${DB_HEALTHCHECK} \${DB_CONTAINER_IP}" fi - scp_to UNRAID "$TMPFILE" "${DATA_PATH}/docker-compose.yml" + scp_to UNRAID "$TMPFILE" "${COMPOSE_DIR}/docker-compose.yml" rm -f "$TMPFILE" - log_success "docker-compose.yml deployed" + log_success "docker-compose.yml deployed to ${COMPOSE_DIR}" fi # --------------------------------------------------------------------------- @@ -125,7 +128,7 @@ if [[ "$CONTAINER_STATUS" == *"Up"* ]]; then log_info "Gitea container already running — skipping" else # Try modern "docker compose" first (plugin), fall back to standalone "docker-compose" - ssh_exec UNRAID "cd '${DATA_PATH}' && docker compose up -d 2>/dev/null || docker-compose up -d" + ssh_exec UNRAID "cd '${COMPOSE_DIR}' && docker compose up -d 2>/dev/null || docker-compose up -d" log_success "Gitea container started" fi