From 308cf1bfe796fbfd06735a75d2cd24235990411b Mon Sep 17 00:00:00 2001
From: Mike Kolesnik <mkolesni@redhat.com>
Date: Mon, 23 Mar 2020 09:59:22 +0200
Subject: [PATCH] Don't create files in the scripts dir

The subctl command creates a broker info file (and backups). Have it
created in the output directory instead of the scripts directory which
is mounted from the host.
---
 Dockerfile.dapper                  |  4 ++--
 scripts/shared/lib/deploy_operator | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index f5015ec73..d9b3fd16b 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -1,8 +1,8 @@
 FROM quay.io/submariner/shipyard-dapper-base
 
 ENV DAPPER_ENV=REPO DAPPER_ENV=TAG \
-    DAPPER_SOURCE=/go/src/github.com/submariner-io/shipyard DAPPER_DOCKER_SOCKET=true \
-    TRASH_CACHE=${DAPPER_SOURCE}/.trash-cache HOME=${DAPPER_SOURCE} DAPPER_OUTPUT=output
+    DAPPER_SOURCE=/go/src/github.com/submariner-io/shipyard DAPPER_DOCKER_SOCKET=true
+ENV DAPPER_OUTPUT=${DAPPER_SOURCE}/output
 
 WORKDIR ${DAPPER_SOURCE}
 
diff --git a/scripts/shared/lib/deploy_operator b/scripts/shared/lib/deploy_operator
index f6ed7a6d8..90d156959 100644
--- a/scripts/shared/lib/deploy_operator
+++ b/scripts/shared/lib/deploy_operator
@@ -34,10 +34,12 @@ function deploytool_prereqs() {
 }
 
 function setup_broker() {
-    cluster=$1
     echo "Installing broker..."
-    subctl --kubeconfig ${KUBECONFIGS_DIR}/kind-config-$cluster deploy-broker --no-dataplane
-    unset cluster
+    (
+        cluster=$1
+        cd ${OUTPUT_DIR}
+        subctl --kubeconfig ${KUBECONFIGS_DIR}/kind-config-$cluster deploy-broker --no-dataplane
+    )
 }
 
 function subctl_install_subm() {
@@ -49,7 +51,7 @@ function subctl_install_subm() {
                 --ikeport ${CE_IPSEC_IKEPORT} \
                 --colorcodes ${SUBM_COLORCODES} \
                 --disable-nat \
-                broker-info.subm
+                ${OUTPUT_DIR}/broker-info.subm
 }
 
 function install_subm_all_clusters() {