diff --git a/e2e/public.sh b/e2e/public.sh index 8f6bfe0..e3cc180 100755 --- a/e2e/public.sh +++ b/e2e/public.sh @@ -97,9 +97,11 @@ grep -q "certificate issued by CN=Pebble" "$WORK/deploy.log" || die "deploy did ok "deploy reported Stalwart's certificate" # No --ihasmail-image, so the deploy took the newest release -- and must have -# written it down as a dated tag, never the moving :latest. -image=$(sed -n 's/^ image: \(ghcr.io\/coffey-labs\/ihasmail[:@].*\)$/\1/p' "$DEPLOY/compose.yaml") -[[ "$image" =~ ^ghcr\.io/coffey-labs/ihasmail:[0-9]{4}\.[0-9]{1,2}\.[0-9]{1,2}-(pr[0-9]+|g[0-9a-f]+)$ ]] \ +# written it down as a dated tag, never the moving :latest. The repository is +# config.IhasmailRepository; keep the two in step. +repo=registry.coffeylabs.org/coffey-labs/ihasmail +image=$(grep -E "^ image: ${repo//./\\.}[:@]" "$DEPLOY/compose.yaml" | sed 's/^ image: //') +[[ "$image" =~ ^${repo//./\\.}:[0-9]{4}\.[0-9]{1,2}\.[0-9]{1,2}-(pr[0-9]+|g[0-9a-f]+)$ ]] \ || die "compose.yaml does not pin ihasmail to a dated release: ${image:-none}" ok "compose.yaml pins ihasmail to $image" running=$(docker compose --project-directory "$DEPLOY" ps -q ihasmail | xargs docker inspect --format '{{range .Config.Env}}{{println .}}{{end}}' | sed -n 's/^IHASMAIL_VERSION=//p')