From b7a6e6bd3782b7425deb2184f66dbe77a705ec71 Mon Sep 17 00:00:00 2001 From: mhmxs Date: Sun, 6 Oct 2019 22:07:31 +0200 Subject: [PATCH] Introduce docker builds in Makefile --- Makefile | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 571eff573..090230dd7 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,11 @@ +GO_VERSION=1.12.4 export GO111MODULE=off - GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./.git/*") +DOCKER_RUN?= +_with-docker: + $(eval DOCKER_RUN=docker run --rm -v $(shell pwd)/../../..:/go/src/ -v $(shell pwd)/build:/build -w / golang:$(GO_VERSION)) + all: deps build deps: @@ -17,27 +21,21 @@ format: @gofmt -w ${GOFILES_NOVENDOR} test-agent: - go test -timeout 30s github.com/laszlocph/woodpecker/cmd/drone-agent $(go list ./... | grep -v /vendor/) + $(DOCKER_RUN) go test -timeout 30s github.com/laszlocph/woodpecker/cmd/drone-agent $(go list ./... | grep -v /vendor/) test-server: -ifneq ($(shell uname), "Linux") - $(error Target OS is not Linux drone-server build skipped) -endif - go test -timeout 30s github.com/laszlocph/woodpecker/cmd/drone-server + $(DOCKER_RUN) go test -timeout 30s github.com/laszlocph/woodpecker/cmd/drone-server test-lib: - go test -timeout 30s $(shell go list ./... | grep -v '/cmd/') + $(DOCKER_RUN) go test -timeout 30s $(shell go list ./... | grep -v '/cmd/') test: test-lib test-agent test-server build-agent: - go build -o build/drone-agent github.com/laszlocph/woodpecker/cmd/drone-agent + $(DOCKER_RUN) go build -o build/drone-agent github.com/laszlocph/woodpecker/cmd/drone-agent build-server: -ifneq ($(shell uname), "Linux") - $(error Target OS is not Linux drone-server build skipped) -endif - go build -o build/drone-server github.com/laszlocph/woodpecker/cmd/drone-server + $(DOCKER_RUN) go build -o build/drone-server github.com/laszlocph/woodpecker/cmd/drone-server build: build-agent build-server