Skip to content

Fixed make setup_test_to_use_local_image - #1048

Merged
ToreMerkely merged 1 commit into
mainfrom
fix-local-image-test
Jul 28, 2026
Merged

Fixed make setup_test_to_use_local_image#1048
ToreMerkely merged 1 commit into
mainfrom
fix-local-image-test

Conversation

@ToreMerkely

Copy link
Copy Markdown
Contributor

Description

Checklist

@ToreMerkely
ToreMerkely enabled auto-merge (squash) July 28, 2026 12:27
@claude

claude Bot commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Claude finished @ToreMerkely's task in 53s —— View job


Review complete ✅

  • Gather context (diff, reset-or-start-server.sh, docker-compose.yml)
  • Check for stale merkely references
  • Static analysis assessment

Summary

This PR renames the local-test server image tag from merkely to merkely-test in the setup_test_to_use_local_image Make target, and updates the matching explanatory comment in bin/reset-or-start-server.sh. Small, focused, and correct.

What I verified

  • docker-compose.yml consumes the tag via ${KOSLI_SERVER_IMAGE} (lines 15/37), so merkely-test flows through both the server and any dependent services — no hard-coded tag to update there.
  • The reset-or-start-server.sh branch logic keys off @sha256: (remote/digest-pinned) vs. plain tag, so a plain merkely-test tag still correctly takes the "local image — skip AWS login/pull" path. Behaviour is unchanged; only the tag string moved.
  • The comment in reset-or-start-server.sh:28 was kept in sync with the new tag — nice attention to detail. ✅
  • Grepped the repo for other merkely-as-local-image references. The remaining hits (hack/get-server-image.sh, hack/get-digest-from-api.sh, bin/aws_include.sh) are unrelated contexts (remote registry queries, ECS cluster name), so nothing else needs updating.

Static analysis (Phase 1): N/A — this PR only touches a Makefile and a shell script; no Go sources changed, so go build / go vet / go mod tidy are not applicable.

Notes / non-blocking

  • The tag merkely-test is only meaningful if the server repo's make build actually produces an image with that tag. Worth a quick sanity check that the server-side build was (or will be) updated to match — otherwise docker compose up will fail to find the image. This is coordinated in the server repo, so it's outside this PR's scope, just flagging it.
  • Consider hoisting the literal merkely-test into a Make variable (e.g. LOCAL_SERVER_IMAGE ?= merkely-test) so the tag lives in one place across the target and any future references. Purely optional.

Overall this looks good to merge. 👍

@ToreMerkely
ToreMerkely merged commit 6f57fa6 into main Jul 28, 2026
20 checks passed
@ToreMerkely
ToreMerkely deleted the fix-local-image-test branch July 28, 2026 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants