From a1cd6d9ac9bc9e96da12990ed329acbd3e6f3c0f Mon Sep 17 00:00:00 2001 From: Akhyar Amarullah Date: Fri, 21 Dec 2018 21:23:45 +0700 Subject: [PATCH 1/2] fix Dockerfile to build from current workspace Signed-off-by: Akhyar Amarullah --- .dockerignore | 3 +++ Dockerfile | 8 +++----- Makefile | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..a053eb7 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +.git/ +/vendor/ +/bin/ diff --git a/Dockerfile b/Dockerfile index 7e38d28..fa68dc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,17 +5,15 @@ FROM golang:1.11-alpine as builder RUN apk add --update git make bash RUN go get -u github.com/golang/dep/cmd/dep -# Get sources +# Get sources and dependencies -RUN go get github.com/bloomberg/goldpinger/cmd/goldpinger WORKDIR /go/src/github.com/bloomberg/goldpinger - -# Install our dependencies - +COPY Gopkg.toml Gopkg.lock Makefile ./ RUN make vendor # Build goldpinger +COPY . ./ RUN make bin/goldpinger # Build the asset container, copy over goldpinger diff --git a/Makefile b/Makefile index f7176f5..fcccbdc 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ clean: vendor: rm -rf ./vendor - dep ensure -v + dep ensure -v -vendor-only swagger: swagger generate server -t pkg -f ./swagger.yml --exclude-main -A goldpinger && \ From 6604127c1354a9ef3b527cceb5e84adc05cd8321 Mon Sep 17 00:00:00 2001 From: Akhyar Amarullah Date: Fri, 21 Dec 2018 21:53:47 +0700 Subject: [PATCH 2/2] fix broken simple docker build Signed-off-by: Akhyar Amarullah --- .dockerignore | 1 - Dockerfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index a053eb7..38af8d6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,2 @@ .git/ /vendor/ -/bin/ diff --git a/Dockerfile b/Dockerfile index fa68dc8..ad64b84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM golang:1.11-alpine as builder RUN apk add --update git make bash RUN go get -u github.com/golang/dep/cmd/dep -# Get sources and dependencies +# Get dependencies WORKDIR /go/src/github.com/bloomberg/goldpinger COPY Gopkg.toml Gopkg.lock Makefile ./