Fix rebuild

Author: stephenlienharrell

scripts/rebuild_frontend.sh

@@ -319,26 +319,43 @@ copy_tree_via_staged_tar() {
   echo "rebuild_frontend.sh: extracting staged tar into web:${dest} ..."
   docker compose exec -T web bash -lc \
     "rm -rf '${dest}' && mkdir -p '${dest}' && tar -xf '${container_tar}' -C '${dest}' && rm -f '${container_tar}'"
+  verify_container_extract_fingerprint "${dest}" "${dest}"
 }
 
-run_collectstatic_into_volume() {
-  echo "rebuild_frontend.sh: running collectstatic into ${CONTAINER_STATIC_ROOT_FRONTEND} ..."
-  docker compose exec -T web bash -lc \
-    "rm -rf '${CONTAINER_STATIC_ROOT_FRONTEND}' && /usr/local/bin/python3 hpcperfstats/site/manage.py collectstatic --noinput"
+verify_container_extract_fingerprint() {
+  local dest="$1"
+  local label="$2"
+  local host_fp container_fp probe="${dest}/machine/index.html"
+
+  host_fp="$(frontend_build_fingerprint "${STATIC_FRONTEND}/machine/index.html")"
+  container_fp="$(
+    docker compose exec -T web bash -lc \
+      "grep -oE 'page-[0-9a-f]+\\.js' '${probe}' 2>/dev/null | head -n 1 || echo unknown"
+  )"
+
+  if [[ "${host_fp}" != "${container_fp}" ]]; then
+    echo "rebuild_frontend.sh: ${label} fingerprint mismatch after extract" >&2
+    echo "  host:      ${host_fp}  (${STATIC_FRONTEND}/machine/index.html)" >&2
+    echo "  container: ${container_fp}  (${probe})" >&2
+    return 1
+  fi
+
+  echo "Verified extract fingerprint for ${label} (${container_fp})"
 }
 
-deploy_frontend_via_collectstatic() {
-  echo "rebuild_frontend.sh: podman-compose deploy — stage image source tree, then collectstatic to nginx volume"
+deploy_frontend_via_staged_volume() {
+  echo "rebuild_frontend.sh: podman-compose — staged tar direct to nginx volume (staticfiles_data)"
+  copy_tree_via_staged_tar "${CONTAINER_STATIC_ROOT_FRONTEND}"
+  echo "rebuild_frontend.sh: syncing image source tree for future image rebuilds ..."
   copy_tree_via_staged_tar "${CONTAINER_STATIC_FRONTEND}"
-  run_collectstatic_into_volume
 }
 
 print_podman_deploy_fallback() {
   cat <<EOF >&2
 rebuild_frontend.sh: manual podman fallback (from git checkout):
   tar -cf /tmp/hps-frontend.tar -C hpcperfstats/site/hpcperfstats_site/static/frontend .
   podman cp /tmp/hps-frontend.tar hpcperfstats_web_1:/tmp/hps-frontend.tar
-  docker compose exec web bash -lc 'rm -rf ${CONTAINER_STATIC_FRONTEND} && mkdir -p ${CONTAINER_STATIC_FRONTEND} && tar -xf /tmp/hps-frontend.tar -C ${CONTAINER_STATIC_FRONTEND} && rm -f /tmp/hps-frontend.tar && rm -rf ${CONTAINER_STATIC_ROOT_FRONTEND} && /usr/local/bin/python3 hpcperfstats/site/manage.py collectstatic --noinput'
+  docker compose exec web bash -lc 'rm -rf ${CONTAINER_STATIC_ROOT_FRONTEND} && mkdir -p ${CONTAINER_STATIC_ROOT_FRONTEND} && tar -xf /tmp/hps-frontend.tar -C ${CONTAINER_STATIC_ROOT_FRONTEND} && rm -f /tmp/hps-frontend.tar'
 EOF
 }
 
@@ -362,8 +379,7 @@ copy_tree_into_container() {
     exit 1
   fi
 
-  # podman-compose: stdin tar / compose cp / direct volume copy are unreliable; stage the
-  # image source tree and refresh STATIC_ROOT/frontend with collectstatic (same as startup).
+  # podman-compose: stage tar, extract with compose exec onto the destination path.
   echo "rebuild_frontend.sh: copying via staged tar + compose exec extract → ${dest}"
   copy_tree_via_staged_tar "${dest}"
 }
@@ -372,7 +388,7 @@ copy_frontend_into_web() {
   cd "${REPO_ROOT}"
 
   if compose_backend_is_podman; then
-    deploy_frontend_via_collectstatic
+    deploy_frontend_via_staged_volume
     return
   fi
 

scripts/test_rebuild_frontend_verify.sh

@@ -15,7 +15,7 @@ cleanup() {
 }
 trap cleanup EXIT
 
-for fn in copy_frontend_into_web compose_cp_supported web_container_ref verify_container_frontend_matches_host verify_proxy_frontend_matches_web copy_tree_via_staged_tar compose_backend_is_podman deploy_frontend_via_collectstatic; do
+for fn in copy_frontend_into_web compose_cp_supported web_container_ref verify_container_frontend_matches_host verify_proxy_frontend_matches_web copy_tree_via_staged_tar compose_backend_is_podman deploy_frontend_via_staged_volume verify_container_extract_fingerprint; do
   if ! declare -F "${fn}" >/dev/null; then
     echo "expected ${fn} to be defined in rebuild_frontend.sh" >&2
     exit 1
@@ -47,13 +47,18 @@ if ! grep -q 'PROXY_STATIC_ROOT_FRONTEND' "${REBUILD_SCRIPT}"; then
   exit 1
 fi
 
-if ! grep -q 'deploy_frontend_via_collectstatic' "${REBUILD_SCRIPT}"; then
-  echo "expected podman collectstatic deploy path in rebuild_frontend.sh" >&2
+if ! grep -q 'deploy_frontend_via_staged_volume' "${REBUILD_SCRIPT}"; then
+  echo "expected podman staged-volume deploy path in rebuild_frontend.sh" >&2
   exit 1
 fi
 
-if ! grep -q 'run_collectstatic_into_volume' "${REBUILD_SCRIPT}"; then
-  echo "expected collectstatic volume refresh for podman in rebuild_frontend.sh" >&2
+if ! grep -q 'verify_container_extract_fingerprint' "${REBUILD_SCRIPT}"; then
+  echo "expected post-extract fingerprint verify in rebuild_frontend.sh" >&2
+  exit 1
+fi
+
+if grep -q 'deploy_frontend_via_collectstatic' "${REBUILD_SCRIPT}"; then
+  echo "podman hot deploy must not rely on collectstatic (conflict skips leave stale frontend)" >&2
   exit 1
 fi