From a69ed648f9605d416c9babb1a8cc689a451ad674 Mon Sep 17 00:00:00 2001 From: Kyle Isom Date: Fri, 27 Mar 2026 14:32:05 -0700 Subject: [PATCH] Standardize Makefile docker/push targets for MCR Add MCR and VERSION variables. Tag images with full MCR registry URL and version. Add push target. Fix docker target to build both Dockerfile.api and Dockerfile.web (was only building one). Co-Authored-By: Claude Opus 4.6 (1M context) --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3dddbf7..3f1703f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ -.PHONY: build test vet lint proto proto-lint clean docker all devserver +.PHONY: build test vet lint proto proto-lint clean docker push all devserver -LDFLAGS := -trimpath -ldflags="-s -w -X main.version=$(shell git describe --tags --always --dirty)" +MCR := mcr.svc.mcp.metacircular.net:8443 +VERSION := $(shell git describe --tags --always --dirty) +LDFLAGS := -trimpath -ldflags="-s -w -X main.version=$(VERSION)" mcrsrv: CGO_ENABLED=0 go build $(LDFLAGS) -o mcrsrv ./cmd/mcrsrv @@ -36,7 +38,12 @@ clean: rm -f mcrsrv mcr-web mcrctl docker: - docker build --build-arg VERSION=$(shell git describe --tags --always --dirty) -t mcr -f Dockerfile . + docker build --build-arg VERSION=$(VERSION) -t $(MCR)/mcr:$(VERSION) -f Dockerfile.api . + docker build --build-arg VERSION=$(VERSION) -t $(MCR)/mcr-web:$(VERSION) -f Dockerfile.web . + +push: docker + docker push $(MCR)/mcr:$(VERSION) + docker push $(MCR)/mcr-web:$(VERSION) devserver: mcrsrv @mkdir -p srv