From b79bb06130dd80acddee0619e1350ec3c3581160 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Mon, 4 May 2026 15:16:58 +0200 Subject: [PATCH] Simplify registry authentication logic and update comments Updates the script comment to reference skopeo and clarifies the pre-build authentication check. Removes the conditional docker login wrapper and intermediate prompts, now executing docker login directly. The script will fail fast with a clear error message if authentication fails. --- start-jupyterhub.sh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/start-jupyterhub.sh b/start-jupyterhub.sh index 54193b4..964eb13 100755 --- a/start-jupyterhub.sh +++ b/start-jupyterhub.sh @@ -266,17 +266,15 @@ publish_images() { version=$(read_version) # docker buildx --push uses Docker's own credential store, independent of - # skopeo. Verify auth early to get a clear error before a long build. - echo -e "${BLUE}Checking registry authentication...${NC}" + # skopeo. Prompt once before the (long) build so the user isn't surprised + # by an auth failure at the very end. local registry_host="${REGISTRY%%/*}" - if ! docker login "$registry_host" >/dev/null 2>&1; then - echo -e "${YELLOW}Not logged in to ${registry_host}. Running docker login...${NC}" - docker login "$registry_host" || { - echo "Error: authentication to ${registry_host} failed." >&2 - echo "Run: docker login ${registry_host}" >&2 - exit 1 - } - fi + echo -e "${BLUE}Authenticating to ${registry_host} (required to push)...${NC}" + docker login "$registry_host" || { + echo "Error: authentication to ${registry_host} failed." >&2 + echo "Run: docker login ${registry_host}" >&2 + exit 1 + } echo "" echo -e "${BLUE}Publishing images (version ${version}) to ${REGISTRY}${NC}"