From cf7a7de6798ffc4a9c689cb6eefc7661ab1aa128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Wed, 27 Feb 2019 18:50:17 +0000 Subject: [PATCH] chore(go): use /src as source dir when building Go code Modules no longer require being inside the GOPATH, moving it outside ensures that we don't use anything from GOPATH anymore --- Dockerfile | 10 +++++----- demo/Dockerfile | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index eaee55e1c..0fb86b9f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ FROM node:10.15.1-alpine as nodejs-builder RUN apk add --update make git -COPY . /karma -RUN make -C /karma ui +COPY . /src +RUN make -C /src ui FROM golang:1.12.0-alpine as go-builder -COPY --from=nodejs-builder /karma /go/src/github.com/prymitive/karma +COPY --from=nodejs-builder /src /src ARG VERSION RUN apk add --update make git -RUN CGO_ENABLED=0 make -C /go/src/github.com/prymitive/karma VERSION="${VERSION:-dev}" karma +RUN CGO_ENABLED=0 make -C /src VERSION="${VERSION:-dev}" karma FROM gcr.io/distroless/base COPY ./docs/dark.css /themes/dark.css -COPY --from=go-builder /go/src/github.com/prymitive/karma/karma /karma +COPY --from=go-builder /src/karma /karma EXPOSE 8080 ENTRYPOINT ["/karma"] diff --git a/demo/Dockerfile b/demo/Dockerfile index 2fb09601c..2663dbe5d 100644 --- a/demo/Dockerfile +++ b/demo/Dockerfile @@ -1,13 +1,13 @@ FROM node:10.15.1-alpine as nodejs-builder RUN apk add --update make git -COPY . /karma -RUN make -C /karma ui +COPY . /src +RUN make -C /src ui FROM golang:1.12.0-alpine as go-builder -COPY --from=nodejs-builder /karma /go/src/github.com/prymitive/karma +COPY --from=nodejs-builder /src /src ARG VERSION RUN apk add --update make git -RUN CGO_ENABLED=0 make -C /go/src/github.com/prymitive/karma VERSION="${VERSION:-dev}" karma +RUN CGO_ENABLED=0 make -C /src VERSION="${VERSION:-dev}" karma FROM alpine:3.9 RUN apk add --update supervisor python && rm -rf /tmp/* /var/cache/apk/* @@ -15,7 +15,7 @@ COPY demo/supervisord.conf /etc/supervisord.conf COPY --from=prom/alertmanager:v0.15.3 /bin/alertmanager /alertmanager COPY demo/alertmanager.yaml /etc/alertmanager.yaml COPY demo/generator.py /generator.py -COPY --from=go-builder /go/src/github.com/prymitive/karma/karma /karma +COPY --from=go-builder /src/karma /karma COPY demo/karma.yaml /etc/karma.yaml COPY demo/custom.js /custom.js RUN adduser -D karma