privacy-in-design/gitea-migration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update phase1_gitea_unraid.sh to include UNRAID_COMPOSE_DIR for docker-compose handling

Browse Source
This commit is contained in:
S
2026-03-02 11:42:52 -05:00
parent faada23b8c
commit 8e2bc35781
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
phase1_gitea_unraid.sh
View File

@@ -11,7 +11,7 @@ source "${SCRIPT_DIR}/lib/common.sh"
load_env load_env
require_vars UNRAID_IP UNRAID_SSH_USER UNRAID_SSH_PORT UNRAID_GITEA_DATA_PATH \ 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_ADMIN_USER GITEA_ADMIN_PASSWORD GITEA_ADMIN_EMAIL \
GITEA_ORG_NAME GITEA_INSTANCE_NAME \ GITEA_ORG_NAME GITEA_INSTANCE_NAME \
GITEA_DB_TYPE GITEA_VERSION GITEA_DOMAIN 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 # Templates use $DATA_PATH as a generic variable name so the same template
# works for both Unraid (Phase 1) and Fedora (Phase 2). # works for both Unraid (Phase 1) and Fedora (Phase 2).
DATA_PATH="$UNRAID_GITEA_DATA_PATH" 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. # Reuse Unraid's existing custom network.
UNRAID_DOCKER_NETWORK_NAME="br0" UNRAID_DOCKER_NETWORK_NAME="br0"
@@ -60,9 +62,10 @@ fi
# Step 3: Render + SCP docker-compose file # Step 3: Render + SCP docker-compose file
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
log_step 3 "Deploying docker-compose.yml..." 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" log_info "docker-compose.yml already exists — skipping"
else else
ssh_exec UNRAID "mkdir -p '${COMPOSE_DIR}'"
TMPFILE=$(mktemp) TMPFILE=$(mktemp)
# Set variables for template — containers get dedicated LAN IPs via macvlan # Set variables for template — containers get dedicated LAN IPs via macvlan
GITEA_CONTAINER_IP="${UNRAID_GITEA_IP}" 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}" "\${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 fi
scp_to UNRAID "$TMPFILE" "${DATA_PATH}/docker-compose.yml" scp_to UNRAID "$TMPFILE" "${COMPOSE_DIR}/docker-compose.yml"
rm -f "$TMPFILE" rm -f "$TMPFILE"
log_success "docker-compose.yml deployed" log_success "docker-compose.yml deployed to ${COMPOSE_DIR}"
fi fi
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@@ -125,7 +128,7 @@ if [[ "$CONTAINER_STATUS" == *"Up"* ]]; then
log_info "Gitea container already running — skipping" log_info "Gitea container already running — skipping"
else else
# Try modern "docker compose" first (plugin), fall back to standalone "docker-compose" # 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" log_success "Gitea container started"
fi fi