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

Merge pull request #217 from erthalion/feature/debug-mode 

Add debug mode
This commit is contained in:
zerg-junior 2018-02-02 11:44:13 +01:00 committed by GitHub
parent a3c840d1e5 09abdce095
commit 124cdd1f8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -10,7 +10,8 @@ endif
LOCAL_BUILD_FLAGS ?= $(BUILD_FLAGS) LOCAL_BUILD_FLAGS ?= $(BUILD_FLAGS)
LDFLAGS ?= -X=main.version=$(VERSION) LDFLAGS ?= -X=main.version=$(VERSION)
DOCKERFILE = docker/Dockerfile DOCKERDIR = docker
IMAGE ?= registry.opensource.zalan.do/acid/$(BINARY) IMAGE ?= registry.opensource.zalan.do/acid/$(BINARY)
TAG ?= $(VERSION) TAG ?= $(VERSION)
GITHEAD = $(shell git rev-parse --short HEAD) GITHEAD = $(shell git rev-parse --short HEAD)
@ -21,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)
@ -42,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
cd docker && docker build --rm -t "$(IMAGE):$(TAG)" . 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"

10
docker/DebugDockerfile Normal file
View File

@ -0,0 +1,10 @@
FROM alpine
MAINTAINER Team ACID @ Zalando <team-acid@zalando.de>
# We need root certificates to deal with teams api over https
RUN apk --no-cache add ca-certificates go git musl-dev
RUN go get github.com/derekparker/delve/cmd/dlv
COPY build/* /
CMD ["/root/go/bin/dlv", "--listen=:777", "--headless=true", "--api-version=2", "exec", "/postgres-operator"]