From 884dffd774476222011d60363ba1afd9fcc0a462 Mon Sep 17 00:00:00 2001
From: Mario Manno <mario.manno@suse.com>
Date: Fri, 28 Aug 2020 11:14:14 +0200
Subject: [PATCH 1/2] Add dependency on shared tools to build-image target (ref
 #40)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 580ea65c..434ef9d3 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ test-cluster: tools
 lint: tools
 	$(QUARKS_UTILS)/bin/lint
 
-build-image:
+build-image: tools
 	bin/build-image
 
 .PHONY: tools

From 97e64b5d49d8127034339f4ae9e61f7c1d18e0fa Mon Sep 17 00:00:00 2001
From: Mario Manno <mario.manno@suse.com>
Date: Mon, 31 Aug 2020 11:31:23 +0200
Subject: [PATCH 2/2] Add conditional bin/tools to Dockerfile (closes #40)

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index d8b7aa6d..c3557880 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,8 @@ WORKDIR /go/src/code.cloudfoundry.org/quarks-secret
 
 # Copy the rest of the source code and build
 COPY . .
+RUN [ -f tools/quarks-utils/bin/include/versioning ] || \
+    bin/tools
 RUN bin/build && \
     cp -p binaries/quarks-secret /usr/local/bin/quarks-secret