diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml index cf78772..773a45b 100644 --- a/.github/workflows/release-packages.yml +++ b/.github/workflows/release-packages.yml @@ -72,4 +72,4 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: true - tags: ${{ env.REGISTRY_SERVER_ADDRESS }}/etcd-metrics-proxy:${{steps.tag.outputs.tag}} \ No newline at end of file + tags: ${{ env.REGISTRY_SERVER_ADDRESS }}/etcd-metrics-proxy:${{steps.tag.outputs.tag}} diff --git a/Dockerfile b/Dockerfile index 47f7bc1..fadb8c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,25 @@ -FROM scratch +FROM --platform=$BUILDPLATFORM docker/golang:1.19 as build + +ARG GOPROXY +ARG GOSUMDB +ARG GOPRIVATE +ARG TARGETARCH + +WORKDIR /app + +ENV GO111MODULE=on +# GOPROXY=https://goproxy.cn,direct + +RUN make build + +COPY . . + +# RUN make insight-linux + +FROM alpine:3.15 + +COPY --from=build /app/etcd-metrics-proxy / + +EXPOSE 2381 2381 -ADD etcd-metrics-proxy / ENTRYPOINT [ "/etcd-metrics-proxy" ] diff --git a/Makefile b/Makefile index 8610f44..b9dbf12 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,9 @@ REG=quay.io TAG=0.6.0 PKG=github.com/openinsight-proj/etcd-metrics-proxy +GOARCH ?= $(shell go env GOARCH) +BUILD_ARCH ?= linux/$(GOARCH) + check: go vet . .PHONY: check @@ -13,7 +16,7 @@ test: .PHONY: test build: - GOOS=linux go build -a --ldflags '-extldflags "-static"' -tags netgo -installsuffix netgo -o etcd-metrics-proxy . + GOOS=linux GOARCH=${GOARCH} go build -a --ldflags '-extldflags "-static"' -tags netgo -installsuffix netgo -o etcd-metrics-proxy . .PHONY: build .PHONY: image/build diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..5f161ec --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module github.com/openinsight-proj/etcd-metrics-proxy + +go 1.19