fix(install): server checkoff reads running container, never pulls a registry
The docker-component checkoff ran 'docker run 10.10.20.120:4455/fimeg/redflag' to read a version string — reaching the private Gitea registry from every install, and 'grep redflag' matched unrelated containers. Verify the running redflag-server container's --version locally instead; agent-only hosts skip cleanly. (INSTALL-001)
This commit is contained in:
parent
e5f8444482
commit
23e9c37953
1 changed files with 10 additions and 5 deletions
|
|
@ -561,16 +561,21 @@ while IFS='|' read -r comp_name comp_kind comp_req comp_vcmd comp_file comp_sha
|
|||
continue
|
||||
fi
|
||||
if [ "$comp_kind" = "docker" ]; then
|
||||
if command -v docker >/dev/null 2>&1 && docker container ls 2>/dev/null | grep -q redflag; then
|
||||
DOCKER_VER=$(docker run --rm 10.10.20.120:4455/fimeg/redflag:${VERSION} ./redflag-server --version 2>/dev/null || echo "unknown")
|
||||
# The server runs as a locally-built container (docker compose build) on
|
||||
# the server host. Verify the *running* redflag-server container's
|
||||
# version — never pull from a registry. Hosts with no server container
|
||||
# (agent-only installs) skip cleanly; the server component is not their
|
||||
# concern.
|
||||
if command -v docker >/dev/null 2>&1 && docker container inspect redflag-server >/dev/null 2>&1; then
|
||||
DOCKER_VER=$(docker exec redflag-server ./redflag-server --version 2>/dev/null | head -1 || echo "unknown")
|
||||
if echo "$DOCKER_VER" | grep -q "v${VERSION}"; then
|
||||
checkoff "$comp_name" "ok" "docker image v${VERSION} present"
|
||||
checkoff "$comp_name" "ok" "running container ${DOCKER_VER}"
|
||||
else
|
||||
checkoff "$comp_name" "fail" "docker image reports ${DOCKER_VER}, expected v${VERSION}"
|
||||
checkoff "$comp_name" "fail" "running container reports ${DOCKER_VER}, expected v${VERSION}"
|
||||
HAD_FAILURES=true
|
||||
fi
|
||||
else
|
||||
checkoff "$comp_name" "skip" "docker not available or redflag container not running"
|
||||
checkoff "$comp_name" "skip" "no redflag-server container on this host (agent-only install)"
|
||||
fi
|
||||
continue
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue