From c89d1e314c1f6b4f520a5404532a34ebd2051ed3 Mon Sep 17 00:00:00 2001 From: Ian Fijolek Date: Wed, 14 Aug 2019 10:59:51 -0700 Subject: [PATCH] Update entrypoint and update multi-stage builds --- Dockerfile | 2 +- Dockerfile.multi-stage | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 40ec0ec..edf0813 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,4 +5,4 @@ WORKDIR /root/ ARG ARCH=amd64 COPY ./dockron-linux-${ARCH} ./dockron -CMD [ "./dockron" ] +ENTRYPOINT [ "./dockron" ] diff --git a/Dockerfile.multi-stage b/Dockerfile.multi-stage index bd44517..157d886 100644 --- a/Dockerfile.multi-stage +++ b/Dockerfile.multi-stage @@ -1,5 +1,5 @@ ARG REPO=library -FROM ${REPO}/golang:1.12-alpine AS builder +FROM golang:1.12-alpine AS builder RUN apk add --no-cache git @@ -10,13 +10,14 @@ COPY ./go.mod ./go.sum /app/ RUN go mod download COPY ./main.go /app/ + ARG ARCH=amd64 ARG VERSION=dev ENV CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} -RUN go build -ldflags '-X "main.version=${VERSION}"' -a -installsuffix nocgo -o dockron . +RUN go build -ldflags "-X main.version=${VERSION}" -a -installsuffix nocgo -o dockron . FROM ${REPO}/busybox:latest WORKDIR /root/ COPY --from=builder /app/dockron . -CMD [ "./dockron" ] +ENTRYPOINT [ "./dockron" ]