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

Move Dockerfile to a subdir for smaller build context

This commit is contained in:
Oleksandr Shulgin 2017-02-01 11:06:43 +01:00 committed by Murat Kabilov
parent f6015e5aa0
commit 7974dc8c4e
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -24,3 +24,5 @@ _testmain.go
*.prof *.prof
/vendor/ /vendor/
/.glide/ /.glide/
/build/
/docker/build/

10
Makefile
View File

@ -2,7 +2,7 @@
BINARY ?= postgres-operator BINARY ?= postgres-operator
BUILD_FLAGS ?= -i BUILD_FLAGS ?= -i
DOCKERFILE = Dockerfile DOCKERFILE = docker/Dockerfile
IMAGE ?= pierone.example.com/acid/$(BINARY) IMAGE ?= pierone.example.com/acid/$(BINARY)
TAG ?= $(VERSION) TAG ?= $(VERSION)
GITHEAD = $(shell git rev-parse --short HEAD) GITHEAD = $(shell git rev-parse --short HEAD)
@ -30,8 +30,12 @@ build/linux/${BINARY}: ${SOURCES}
build/macos/${BINARY}: ${SOURCES} build/macos/${BINARY}: ${SOURCES}
GOOS=darwin GOARCH=amd64 go build -o $@ ${BUILD_FLAGS} $^ GOOS=darwin GOARCH=amd64 go build -o $@ ${BUILD_FLAGS} $^
docker: ${DOCKERFILE} scm-source.json linux docker-context: scm-source.json linux
docker build --rm -t "$(IMAGE):$(TAG)" -f $< . mkdir -p docker/build/
cp build/linux/${BINARY} scm-source.json docker/build/
docker: ${DOCKERFILE} docker-context
cd docker && docker build --rm -t "$(IMAGE):$(TAG)" .
push: push:
docker push "$(IMAGE):$(TAG)" docker push "$(IMAGE):$(TAG)"

4
Dockerfile → docker/Dockerfile
View File

@ -1,8 +1,6 @@
FROM alpine FROM alpine
MAINTAINER Team ACID @ Zalando <team-acid@zalando.de> MAINTAINER Team ACID @ Zalando <team-acid@zalando.de>
ADD build/linux/postgres-operator /postgres-operator COPY build/* /
ADD scm-source.json /
ENTRYPOINT ["/postres-operator"] ENTRYPOINT ["/postres-operator"]