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