public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improvements for debug mode 

Return back `cd docker` part to be less invasive,
and add `-debug` postfix for image
This commit is contained in:
Dmitrii Dolgov 2018-02-02 11:17:12 +01:00
parent bf7df5d5b5
commit 09abdce095
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -8,18 +8,9 @@ ifeq ($(RACE),1)
CGO_ENABLED=1 CGO_ENABLED=1
endif endif
ifeq ($(DEBUG),1)
BUILD_FLAGS += -gcflags "-N -l"
endif
LOCAL_BUILD_FLAGS ?= $(BUILD_FLAGS) LOCAL_BUILD_FLAGS ?= $(BUILD_FLAGS)
LDFLAGS ?= -X=main.version=$(VERSION) LDFLAGS ?= -X=main.version=$(VERSION)
DOCKERDIR = docker
ifeq ($(DEBUG),1)
DOCKERFILE = docker/DebugDockerfile
else
DOCKERFILE = docker/Dockerfile
endif
IMAGE ?= registry.opensource.zalan.do/acid/$(BINARY) IMAGE ?= registry.opensource.zalan.do/acid/$(BINARY)
TAG ?= $(VERSION) TAG ?= $(VERSION)
@ -31,6 +22,14 @@ VERSION ?= $(shell git describe --tags --always --dirty)
DIRS := cmd pkg DIRS := cmd pkg
PKG := `go list ./... | grep -v /vendor/` PKG := `go list ./... | grep -v /vendor/`
ifeq ($(DEBUG),1)
DOCKERFILE = DebugDockerfile
DEBUG_POSTFIX := -debug
BUILD_FLAGS += -gcflags "-N -l"
else
DOCKERFILE = Dockerfile
endif
PATH := $(GOPATH)/bin:$(PATH) PATH := $(GOPATH)/bin:$(PATH)
SHELL := env PATH=$(PATH) $(SHELL) SHELL := env PATH=$(PATH) $(SHELL)
@ -52,8 +51,8 @@ docker-context: scm-source.json linux
mkdir -p docker/build/ mkdir -p docker/build/
cp build/linux/${BINARY} scm-source.json docker/build/ cp build/linux/${BINARY} scm-source.json docker/build/
docker: ${DOCKERFILE} docker-context docker: ${DOCKERDIR}/${DOCKERFILE} docker-context
docker build --rm -t "$(IMAGE):$(TAG)" -f "${DOCKERFILE}" . cd "${DOCKERDIR}" && docker build --rm -t "$(IMAGE):$(TAG)$(DEBUG_POSTFIX)" -f "${DOCKERFILE}" .
indocker-race: indocker-race:
docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.8.1 bash -c "make linux" docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.8.1 bash -c "make linux"