primal/athens
1
0
Fork 0
mirror of https://github.com/gomods/athens synced 2026-02-03 11:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use alpine tini (#1260)

Browse Source 
* use alpine tini

* do not COPY tini from the builder
This commit is contained in:
marpio
2019-05-31 14:26:27 +02:00
committed by Marwan Sulaiman
parent b2b9c378f6
commit d0472f666e
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/proxy/Dockerfile
+3 -8
View File
@@ -12,11 +12,6 @@ ARG VERSION="unset"
RUN DATE="$(date -u +%Y-%m-%d-%H:%M:%S-%Z)" && GO111MODULE=on CGO_ENABLED=0 go build -mod=vendor -ldflags "-X github.com/gomods/athens/pkg/build.version=$VERSION -X github.com/gomods/athens/pkg/build.buildDate=$DATE" -o /bin/athens-proxy ./cmd/proxy
# Add tini, see https://github.com/gomods/athens/issues/1155 for details.
ENV TINI_VERSION v0.18.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static /tini
RUN chmod +x /tini
FROM alpine
ENV GO111MODULE=on
@@ -24,15 +19,15 @@ ENV GO111MODULE=on
COPY --from=builder /bin/athens-proxy /bin/athens-proxy
COPY --from=builder /go/src/github.com/gomods/athens/config.dev.toml /config/config.toml
COPY --from=builder /usr/local/go/bin/go /bin/go
COPY --from=builder /tini /bin/tini
RUN apk add --update bzr git mercurial openssh-client subversion procps fossil && \
# Add tini, see https://github.com/gomods/athens/issues/1155 for details.
RUN apk add --update bzr git mercurial openssh-client subversion procps fossil tini && \
mkdir -p /usr/local/go
ENV GO_ENV=production
EXPOSE 3000
ENTRYPOINT [ "tini", "--" ]
ENTRYPOINT [ "/sbin/tini", "--" ]
CMD ["athens-proxy", "-config_file=/config/config.toml"]