From 948ae8315dbe87678f82565f0fb35ea1c637e004 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Mon, 27 May 2019 13:46:16 +0200 Subject: [PATCH] add scm-source.json --- Makefile | 6 ++++++ delivery.yaml | 3 +-- docker/logical-backup/Dockerfile | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5b27281c2..7e2a0991d 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,12 @@ docker: ${DOCKERDIR}/${DOCKERFILE} docker-context echo "git describe $(shell git describe --tags --always --dirty)" cd "${DOCKERDIR}" && docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_POSTFIX)" -f "${DOCKERFILE}" . +docker-logical-backup: scm-source.json linux + mv scm-source.json ./docker/logical-backup + docker build --rm -t "$(LB_IMAGE)" ./docker/logical-backup + docker push "$LB_IMAGE" + rm ./docker/logical-backup/scm-source.json + indocker-race: docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.8.1 bash -c "make linux" diff --git a/delivery.yaml b/delivery.yaml index 1ca126222..1bb6d5b22 100644 --- a/delivery.yaml +++ b/delivery.yaml @@ -21,8 +21,7 @@ pipeline: else LB_IMAGE=registry-write.opensource.zalan.do/acid/logical-backup-test:${CDP_BUILD_VERSION} fi - docker build -t "$LB_IMAGE" ./docker/logical-backup - docker push "$LB_IMAGE" + make docker-logical-backup - desc: 'Install go' cmd: | cd /tmp diff --git a/docker/logical-backup/Dockerfile b/docker/logical-backup/Dockerfile index 4f7c7303b..a789801bd 100644 --- a/docker/logical-backup/Dockerfile +++ b/docker/logical-backup/Dockerfile @@ -27,6 +27,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* COPY dump.sh /dump.sh +COPY scm-source.json /scm-source.json ENV PG_DIR=/usr/lib/postgresql/