From e15159443b28667233796ccd8960842a8bc8bad0 Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Thu, 13 May 2021 22:08:33 +0300 Subject: [PATCH] Dockerfile: reuse make, drop upx upx is nice, but not necessary for this and duplicating Makefile is just not good. Note that in absence of vendoring building this can be problematic at the moment because of private repository dependency, it'll be solved in future. --- Dockerfile | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94847f35e..1f8d308e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,36 +4,20 @@ WORKDIR /src RUN set -x \ && apt update \ - && apt install -y upx-ucl + && apt install -y make COPY . /src ARG VERSION=dev -# https://github.com/golang/go/wiki/Modules#how-do-i-use-vendoring-with-modules-is-vendoring-going-away -# go build -mod=vendor -# The -gcflags "all=-N -l" flag helps us get a better debug experience -RUN set -x \ - && export BUILD=$(date -u +%s%N) \ - && export REPO=$(go list -m) \ - && export LDFLAGS="-X ${REPO}/misc.Version=${VERSION} -X ${REPO}/misc.Build=${BUILD}" \ - && export GOGC=off \ - && export CGO_ENABLED=0 \ - && [ -d "./vendor" ] || go mod vendor \ - && go build \ - -v \ - -mod=vendor \ - -trimpath \ - -ldflags "${LDFLAGS}" \ - -o /go/bin/neofs-s3 ./cmd/gate \ - && upx -3 /go/bin/neofs-s3 +RUN make # Executable image FROM scratch WORKDIR / -COPY --from=builder /go/bin/neofs-s3 /bin/neofs-s3 +COPY --from=builder /src/bin/neofs-s3-gw /bin/neofs-s3-gw COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -ENTRYPOINT ["/bin/neofs-s3"] +ENTRYPOINT ["/bin/neofs-s3-gw"]