Fixup Dockerfile to new project structure

Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
Use the makefile for deps also for non-publish builds
2020-05-19 12:56:40 +02:00 · 2020-05-19 12:55:26 +02:00
2 changed files with 3 additions and 3 deletions
--- a/build/ci/drone.yml
+++ b/build/ci/drone.yml
@ -54,8 +54,8 @@ steps:
  - mkdir -p /go/src/git.martyn.berlin/martyn
  - ln -s /drone/src /go/src/git.martyn.berlin/martyn/LEDController
  - cd /go/src/git.martyn.berlin/martyn/LEDController
-  - go get
-  - go build
+  - make deps
+  - make

 trigger:
  ref:
--- a/build/package/Dockerfile
+++ b/build/package/Dockerfile
@ -1,6 +1,6 @@
 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/git.martyn.berlin/martyn/LEDController/
+COPY cmd /go/src/git.martyn.berlin/martyn/LEDController/cmd/
 COPY internal/ /go/src/git.martyn.berlin/martyn/LEDController/internal/
 COPY Makefile /go/src/git.martyn.berlin/martyn/LEDController/
 RUN cd /go/src/git.martyn.berlin/martyn/LEDController/; make deps ; make static
Author	SHA1	Message	Date
Martyn	a9e465f8b3	Fixup Dockerfile to new project structure Signed-off-by: Martyn Ranyard <m@rtyn.berlin>	2020-05-19 12:56:40 +02:00
Martyn	990e30eb2f	Use the makefile for deps also for non-publish builds Signed-off-by: Martyn Ranyard <m@rtyn.berlin>	2020-05-19 12:55:26 +02:00