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

fix: update Docker network variable usage for consistency in Fedora deployment script

Browse Source
This commit is contained in:
S
2026-03-02 10:38:54 -05:00
parent 59e3e8e06a
commit d5edc4d49b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phase2_gitea_fedora.sh
View File

@@ -27,6 +27,7 @@ phase_header 2 "Gitea on Fedora (Backup)"
# Alias for template rendering — same template as Phase 1, different values # Alias for template rendering — same template as Phase 1, different values
DATA_PATH="$FEDORA_GITEA_DATA_PATH" DATA_PATH="$FEDORA_GITEA_DATA_PATH"
FEDORA_DOCKER_NETWORK_NAME="gitea_net"
# DB helpers and strip_template_block are in lib/common.sh # DB helpers and strip_template_block are in lib/common.sh
@@ -48,8 +49,8 @@ fi
# Step 2: Create macvlan Docker network (idempotent) # Step 2: Create macvlan Docker network (idempotent)
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
log_step 2 "Creating macvlan Docker network on Fedora..." log_step 2 "Creating macvlan Docker network on Fedora..."
if ssh_exec FEDORA "docker network inspect gitea_net" &>/dev/null; then if ssh_exec FEDORA "docker network inspect '${FEDORA_DOCKER_NETWORK_NAME}'" &>/dev/null; then
log_info "gitea_net network already exists — skipping" log_info "${FEDORA_DOCKER_NETWORK_NAME} network already exists — skipping"
else else
ssh_exec FEDORA "docker network create \ ssh_exec FEDORA "docker network create \
--driver macvlan \ --driver macvlan \
@@ -57,8 +58,8 @@ else
--gateway='${FEDORA_MACVLAN_GATEWAY}' \ --gateway='${FEDORA_MACVLAN_GATEWAY}' \
--ip-range='${FEDORA_MACVLAN_IP_RANGE}' \ --ip-range='${FEDORA_MACVLAN_IP_RANGE}' \
-o parent='${FEDORA_MACVLAN_PARENT}' \ -o parent='${FEDORA_MACVLAN_PARENT}' \
gitea_net" '${FEDORA_DOCKER_NETWORK_NAME}'"
log_success "macvlan network gitea_net created" log_success "macvlan network ${FEDORA_DOCKER_NETWORK_NAME} created"
fi fi
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@@ -71,11 +72,12 @@ if ssh_exec FEDORA "test -f '${DATA_PATH}/docker-compose.yml'"; then
else else
TMPFILE=$(mktemp) TMPFILE=$(mktemp)
GITEA_CONTAINER_IP="${FEDORA_GITEA_IP}" GITEA_CONTAINER_IP="${FEDORA_GITEA_IP}"
export DATA_PATH GITEA_CONTAINER_IP GITEA_NETWORK_NAME="${FEDORA_DOCKER_NETWORK_NAME}"
export DATA_PATH GITEA_CONTAINER_IP GITEA_NETWORK_NAME
if [[ "$GITEA_DB_TYPE" == "sqlite3" ]]; then if [[ "$GITEA_DB_TYPE" == "sqlite3" ]]; then
render_template "${SCRIPT_DIR}/templates/docker-compose-gitea.yml.tpl" "$TMPFILE" \ render_template "${SCRIPT_DIR}/templates/docker-compose-gitea.yml.tpl" "$TMPFILE" \
"\${GITEA_VERSION} \${DATA_PATH} \${GITEA_CONTAINER_IP}" "\${GITEA_VERSION} \${DATA_PATH} \${GITEA_CONTAINER_IP} \${GITEA_NETWORK_NAME}"
strip_template_block "$TMPFILE" "DB_SERVICE_START" "DB_SERVICE_END" strip_template_block "$TMPFILE" "DB_SERVICE_START" "DB_SERVICE_END"
strip_template_block "$TMPFILE" "DB_DEPENDS_START" "DB_DEPENDS_END" strip_template_block "$TMPFILE" "DB_DEPENDS_START" "DB_DEPENDS_END"
else else
@@ -83,7 +85,7 @@ else
DB_CONTAINER_IP="${FEDORA_DB_IP}" DB_CONTAINER_IP="${FEDORA_DB_IP}"
export DB_CONTAINER_IP export DB_CONTAINER_IP
render_template "${SCRIPT_DIR}/templates/docker-compose-gitea.yml.tpl" "$TMPFILE" \ render_template "${SCRIPT_DIR}/templates/docker-compose-gitea.yml.tpl" "$TMPFILE" \
"\${GITEA_VERSION} \${DATA_PATH} \${GITEA_CONTAINER_IP} \${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 FEDORA "$TMPFILE" "${DATA_PATH}/docker-compose.yml" scp_to FEDORA "$TMPFILE" "${DATA_PATH}/docker-compose.yml"