From e4b1cdd8692bcd7d4ec052d17bbb018eb45bb586 Mon Sep 17 00:00:00 2001 From: Martyn Ranyard Date: Thu, 13 Feb 2020 16:48:32 +0100 Subject: [PATCH] Fix Dockerfile and move deployment stuff Signed-off-by: Martyn Ranyard --- Dockerfile | 7 ++++--- configmap.yaml => deployments/kubernetes/configmap.yaml | 0 deploy.yaml => deployments/kubernetes/deploy.yaml | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename configmap.yaml => deployments/kubernetes/configmap.yaml (100%) rename deploy.yaml => deployments/kubernetes/deploy.yaml (100%) diff --git a/Dockerfile b/Dockerfile index b64d442..5401d5f 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,13 @@ FROM golang@sha256:cee6f4b901543e8e3f20da3a4f7caac6ea643fd5a46201c3c2387183a332d989 AS builder RUN apk update && apk add --no-cache git make ca-certificates && update-ca-certificates -COPY main.go /go/src/github.com/iMartyn/karaokards/ -RUN cd /go/src/github.com/iMartyn/karaokards/; go get; CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o karaokards . +COPY main.go /go/src/git.martyn.berlin/martyn/karaokards/ +COPY internal/ /go/src/git.martyn.berlin/martyn/karaokards/internal/ +RUN cd /go/src/git.martyn.berlin/martyn/karaokards/; go get; CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o karaokards . #RUN ls /go/src/github.com/karaokards/ -l FROM scratch COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /go/src/github.com/iMartyn/karaokards/karaokards /app/ +COPY --from=builder /go/src/git.martyn.berlin/martyn/karaokards /app/ COPY strings.json /app/strings.json CMD ["/app/karaokards"] \ No newline at end of file diff --git a/configmap.yaml b/deployments/kubernetes/configmap.yaml similarity index 100% rename from configmap.yaml rename to deployments/kubernetes/configmap.yaml diff --git a/deploy.yaml b/deployments/kubernetes/deploy.yaml similarity index 100% rename from deploy.yaml rename to deployments/kubernetes/deploy.yaml