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

align UI pipeline with operator (#844) 

* align UI pipeline with operator
This commit is contained in:
Felix Kunde 2020-02-24 17:48:14 +01:00 committed by GitHub
parent b997e3682f
commit fb9ef11e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
delivery.yaml
View File

@ -66,20 +66,13 @@ pipeline:
- desc: 'Build and push Docker image' - desc: 'Build and push Docker image'
cmd: | cmd: |
cd ui cd ui
image_base='registry-write.opensource.zalan.do/acid/postgres-operator-ui' IS_PR_BUILD=${CDP_PULL_REQUEST_NUMBER+"true"}
if [[ "${CDP_TARGET_BRANCH}" == 'master' && -z "${CDP_PULL_REQUEST_NUMBER}" ]] if [[ ${CDP_TARGET_BRANCH} == "master" && ${IS_PR_BUILD} != "true" ]]
then then
image="${image_base}" IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator-ui
else else
image="${image_base}-test" IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator-ui-test
fi fi
image_with_tag="${image}:c${CDP_BUILD_VERSION}" export IMAGE
make docker
if docker pull "${image}" make push
then
docker build --cache-from="${image}" -t "${image_with_tag}" .
else
docker build -t "${image_with_tag}" .
fi
docker push "${image_with_tag}"

13
ui/Makefile
View File

@ -5,9 +5,13 @@ VERSION ?= $(shell git describe --tags --always --dirty)
TAG ?= $(VERSION) TAG ?= $(VERSION)
GITHEAD = $(shell git rev-parse --short HEAD) GITHEAD = $(shell git rev-parse --short HEAD)
GITURL = $(shell git config --get remote.origin.url) GITURL = $(shell git config --get remote.origin.url)
GITSTATU = $(shell git status --porcelain || echo 'no changes') GITSTATUS = $(shell git status --porcelain || echo 'no changes')
TTYFLAGS = $(shell test -t 0 && echo '-it') TTYFLAGS = $(shell test -t 0 && echo '-it')
ifdef CDP_PULL_REQUEST_NUMBER
CDP_TAG := -${CDP_BUILD_VERSION}
endif
default: docker default: docker
clean: clean:
@ -24,11 +28,12 @@ docker: appjs
echo `(env)` echo `(env)`
echo "Tag ${TAG}" echo "Tag ${TAG}"
echo "Version ${VERSION}" echo "Version ${VERSION}"
echo "CDP tag ${CDP_TAG}"
echo "git describe $(shell git describe --tags --always --dirty)" echo "git describe $(shell git describe --tags --always --dirty)"
docker build --rm -t "$(IMAGE):$(TAG)" -f Dockerfile . docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)" -f Dockerfile .
push: docker push:
docker push "$(IMAGE):$(TAG)" docker push "$(IMAGE):$(TAG)$(CDP_TAG)"
mock: mock:
docker run -it -p 8080:8080 "$(IMAGE):$(TAG)" --mock docker run -it -p 8080:8080 "$(IMAGE):$(TAG)" --mock