From 5d886724eac63c417dd042d3e1e32c3ea304c276 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Tue, 25 Aug 2020 18:04:53 +0200 Subject: [PATCH] build image for pierone --- e2e/Dockerfile | 1 + e2e/Makefile | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/e2e/Dockerfile b/e2e/Dockerfile index 5d8348b6b..23421695c 100644 --- a/e2e/Dockerfile +++ b/e2e/Dockerfile @@ -4,6 +4,7 @@ FROM ubuntu:18.04 LABEL maintainer="Team ACID @ Zalando " COPY requirements.txt ./ +COPY scm-source.json ./ RUN apt-get update \ && apt-get install --no-install-recommends -y \ diff --git a/e2e/Makefile b/e2e/Makefile index 5128331ac..c1a514ff9 100644 --- a/e2e/Makefile +++ b/e2e/Makefile @@ -1,6 +1,6 @@ .PHONY: clean copy docker push tools test -BINARY ?= postgres-operator-e2e-tests +BINARY ?= postgres-operator-e2e-tests-runner BUILD_FLAGS ?= -v CGO_ENABLED ?= 0 ifeq ($(RACE),1) @@ -34,9 +34,12 @@ copy: clean mkdir manifests cp ../manifests -r . -docker: +docker: scm-source.json docker build -t "$(IMAGE):$(TAG)" . +scm-source.json: ../.git + echo '{\n "url": "git:$(GITURL)",\n "revision": "$(GITHEAD)",\n "author": "$(USER)",\n "status": "$(GITSTATUS)"\n}' > scm-source.json + push: docker docker push "$(IMAGE):$(TAG)"