From c0c797b20f0760148940a755dd0f9dd6b854144d Mon Sep 17 00:00:00 2001 From: Matthew Walter Date: Thu, 24 Aug 2017 22:57:26 -0400 Subject: [PATCH 1/2] Update Go language version 1.6.3 -> 1.9.0, as well as Alpine 3.4 -> 3.6 --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index edb34f4..31950a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,7 @@ -FROM alpine:3.4 +FROM golang:1.9.0-alpine3.6 MAINTAINER Christopher Maier -ENV GO_PACKAGE_VERSION 1.6.3-r0 ENV GOPATH /gopath ENV PATH=${GOPATH}/bin:${PATH} @@ -10,8 +9,6 @@ WORKDIR /gopath/src/github.com/operable/go-relay COPY . /gopath/src/github.com/operable/go-relay RUN apk -U add --virtual .build_deps \ - go=$GO_PACKAGE_VERSION \ - go-tools=$GO_PACKAGE_VERSION \ git make && \ go get -u github.com/kardianos/govendor && \ @@ -27,3 +24,5 @@ RUN apk -U add --virtual .build_deps \ apk del .build_deps && \ rm -Rf /var/cache/apk/* && \ rm -Rf $GOPATH + +ENTRYPOINT ["/usr/local/bin/relay"] From f44e34d693f8ba59c8a9599e76de2b180a684121 Mon Sep 17 00:00:00 2001 From: Matthew Walter Date: Thu, 24 Aug 2017 23:11:01 -0400 Subject: [PATCH 2/2] Accidentally left an ENTRYPOINT on the Dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 31950a8..7aa7cee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,5 +24,3 @@ RUN apk -U add --virtual .build_deps \ apk del .build_deps && \ rm -Rf /var/cache/apk/* && \ rm -Rf $GOPATH - -ENTRYPOINT ["/usr/local/bin/relay"]