diff --git a/Dockerfile b/Dockerfile index b28af0cff..96c3f234e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ COPY Makefile /src/Makefile COPY go.mod /src/go.mod COPY go.sum /src/go.sum RUN make -C /src download-deps +RUN make -C /src install-deps-build-go COPY --from=nodejs-builder /src/ui /src/ui COPY --from=nodejs-builder /src/.build /src/.build COPY cmd /src/cmd diff --git a/Makefile b/Makefile index 63a3c1f3b..f1baa90ea 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,13 @@ endif .DEFAULT_GOAL := $(NAME) -.build/deps-build-go.ok: +.build/deps-build-go.ok: go.mod go.sum @mkdir -p .build GO111MODULE=on go install github.com/go-bindata/go-bindata/... GO111MODULE=on go install github.com/elazarl/go-bindata-assetfs/... touch $@ -.build/deps-lint-go.ok: +.build/deps-lint-go.ok: go.mod go.sum @mkdir -p .build GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint touch $@ @@ -52,6 +52,9 @@ $(NAME): .build/deps-build-go.ok go.mod cmd/karma/bindata_assetfs.go $(SOURCES) download-deps: GO111MODULE=on go mod download +.PHONY: install-deps-build-go +install-deps-build-go: .build/deps-build-go.ok + word-split = $(word $2,$(subst -, ,$1)) cc-%: .build/deps-build-go.ok go.mod cmd/karma/bindata_assetfs.go $(SOURCES) $(eval GOOS := $(call word-split,$*,1)) diff --git a/demo/Dockerfile b/demo/Dockerfile index bb184f43e..335b85643 100644 --- a/demo/Dockerfile +++ b/demo/Dockerfile @@ -13,6 +13,7 @@ COPY Makefile /src/Makefile COPY go.mod /src/go.mod COPY go.sum /src/go.sum RUN make -C /src download-deps +RUN make -C /src install-deps-build-go COPY --from=nodejs-builder /src/ui /src/ui COPY --from=nodejs-builder /src/.build /src/.build COPY cmd /src/cmd