diff --git a/Makefile b/Makefile index 7ed85769..4522ff06 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ PROXY_IMAGE ?= mesh-route-proxy:$(VERSION) PROXY_DEV_TAG ?= mesh-route-proxy:development proxy-image: - docker build --build-arg GO_BASE=$(GO_BASE) -f examples/route-proxy/Dockerfile -t $(PROXY_IMAGE) -t $(PROXY_DEV_TAG) . + docker build --build-arg GO_BASE=$(GO_BASE) -f modules/route-proxy/Dockerfile -t $(PROXY_IMAGE) -t $(PROXY_DEV_TAG) . @echo @docker image inspect $(PROXY_IMAGE) --format 'built {{.RepoTags}} {{.Size}} bytes' diff --git a/examples/route-proxy/Dockerfile b/examples/route-proxy/Dockerfile deleted file mode 100644 index 03958031..00000000 --- a/examples/route-proxy/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -# The route proxy, as a module ships one. -# -# Static and FROM scratch like the control plane's image, and for the same reason: it is fetched -# by digest and run on a machine, so everything in it is something a person would have to audit. -# The Go it builds with is the one the manifest pins (build.on GO_BASE), passed by the Makefile and the -# build machine alike; the default only serves a hand build, and matches go.mod. -ARG GO_BASE=golang:1.26-alpine -FROM ${GO_BASE} AS build -WORKDIR /src -COPY go.mod go.sum ./ -RUN go mod download -COPY . . -RUN CGO_ENABLED=0 go build -trimpath -buildvcs=false -ldflags '-s -w' -o /mesh-route-proxy ./examples/route-proxy - -FROM scratch -COPY --from=build /mesh-route-proxy /mesh-route-proxy -ENTRYPOINT ["/mesh-route-proxy"]