From a44954e108fbb2468478b079ff791010a0964665 Mon Sep 17 00:00:00 2001 From: Anton Afanasyeu Date: Sat, 11 Jul 2026 15:28:00 +0200 Subject: [PATCH] Ensure ac-ms-media-transcode is cloned on lab nodes during compose. Fallback git clone when workspace submodule is missing; include repo in deploy-ac-workspace compose submodule list. Co-authored-by: Cursor --- sim/cluster0/scripts/compose-lab-backend.sh | 18 ++++++++++++++++++ sim/cluster0/scripts/deploy-ac-workspace.sh | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/sim/cluster0/scripts/compose-lab-backend.sh b/sim/cluster0/scripts/compose-lab-backend.sh index cf9bed8..1c2a1a5 100755 --- a/sim/cluster0/scripts/compose-lab-backend.sh +++ b/sim/cluster0/scripts/compose-lab-backend.sh @@ -11,6 +11,24 @@ LAB_SEED="${ROOT}/lab-seeds/backend" LEGACY="$LAB_SEED" COMPOSED="${COMPOSE_BACKEND:-/var/www/ac/composed/backend}" PLATFORM_ROOT="${AC_PLATFORM_ROOT:-/var/www/ac/platform}" + +ensure_ac_ms_media_transcode() { + _mt="${WS}/ac-ms-media-transcode" + _origin="${AC_MEDIA_TRANSCODE_ORIGIN:-git://f0xx.org/ac/ac-ms-media-transcode}" + _branch="${AC_GIT_BRANCH:-next}" + if [ -d "${_mt}/.git" ]; then + log "update ac-ms-media-transcode in ${_mt}" + git -C "${_mt}" fetch origin 2>/dev/null || true + git -C "${_mt}" checkout "${_branch}" 2>/dev/null || true + git -C "${_mt}" pull --ff-only origin "${_branch}" 2>/dev/null \ + || git -C "${_mt}" reset --hard "origin/${_branch}" 2>/dev/null || true + else + log "clone ac-ms-media-transcode → ${_mt}" + git clone --branch "${_branch}" "${_origin}" "${_mt}" + fi + chmod +x "${_mt}/bin/"*.sh 2>/dev/null || true +} +ensure_ac_ms_media_transcode APP_PASS="$(read_cred mariadb_app password)" DB_HOST="$PRIMARY_DB_HOST" if is_primary_node; then diff --git a/sim/cluster0/scripts/deploy-ac-workspace.sh b/sim/cluster0/scripts/deploy-ac-workspace.sh index ba7af19..7fefe85 100755 --- a/sim/cluster0/scripts/deploy-ac-workspace.sh +++ b/sim/cluster0/scripts/deploy-ac-workspace.sh @@ -10,7 +10,7 @@ AC_ROOT="${AC_WORKSPACE_ROOT:-/var/www/ac/workspace}" ORIGIN="${AC_WORKSPACE_ORIGIN:-git://f0xx.org/ac/ac-workspace}" BRANCH="${AC_GIT_BRANCH:-next}" SUBS_CORE="${AC_SUBMODULES_CORE:-ac-platform-db ac-platform-php ac-platform-web ac-platform-edge ac-deploy ac-docs ac-scripts ac-ms-url-shortener ac-be-hub ac-ms-identity}" -SUBS_COMPOSE="${AC_SUBMODULES_COMPOSE:-ac-platform-php ac-platform-web ac-ms-identity ac-ms-rbac ac-ms-devices ac-ms-issues ac-ms-tickets ac-ms-graphs ac-ms-remote-access ac-be-auth ac-be-issues ac-be-tickets ac-be-graphs ac-be-remote-access ac-be-access ac-be-builder ac-ms-build}" +SUBS_COMPOSE="${AC_SUBMODULES_COMPOSE:-ac-platform-php ac-platform-web ac-ms-identity ac-ms-rbac ac-ms-devices ac-ms-issues ac-ms-tickets ac-ms-graphs ac-ms-remote-access ac-ms-media-transcode ac-be-auth ac-be-issues ac-be-tickets ac-be-graphs ac-be-remote-access ac-be-access ac-be-builder ac-ms-build}" mkdir -p "$(dirname "$AC_ROOT")" git config --global --add safe.directory "$AC_ROOT" 2>/dev/null || true