From e00c618e9cf08f5bfbb21a46fdb9f08977b0e7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rn=20Zaefferer?= Date: Wed, 20 Jun 2018 13:58:26 +0200 Subject: [PATCH] cleanup readme, move docker-test command to makefile --- GNUmakefile | 3 +++ README.md | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index c61d322..a1cd37e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -35,6 +35,9 @@ coverage-report: dev-osx: docker run -v $(CURDIR):/go/src/github.com/sloppyio/sloppose --workdir /go/src/github.com/sloppyio/sloppose -e GOOS=darwin golang:$(GOVERSION) make build-dev +test-in-docker: + docker run -v $(CURDIR):/go/src/github.com/sloppyio/sloppose --workdir /go/src/github.com/sloppyio/sloppose -e CGO_ENABLED=1 golang:$(GOVERSION) make test + build-dev: go build -ldflags "-X ${VERSION_NAMESPACE}.VersionName=`git describe --exact-match --abbrev=0`" -o ./$(APPNAME) $(SRCPATH) diff --git a/README.md b/README.md index 6de0877..dc540cc 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,4 @@ Create a development build within the Go environment: `make build-dev` Create an osx build with docker: `make dev-osx` -or: - -`docker run -v $PWD:/go/src/github.com/sloppyio/sloppose --workdir /go/src/github.com/sloppyio/sloppose -e GOOS=darwin golang:1.9.4 make build-dev` - -To run tests with Docker: - -`docker run -v $PWD:/go/src/github.com/sloppyio/sloppose --workdir /go/src/github.com/sloppyio/sloppose -e CGO_ENABLED=1 golang:1.9.4 make test` +To run tests with Docker: `test-in-docker`