Skip to content

Commit

Permalink
Don't create files in the scripts dir
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mkolesnik authored and dfarrell07 committed Mar 24, 2020
1 parent 0b7c1eb commit 308cf1b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -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}

Expand Down
10 changes: 6 additions & 4 deletions scripts/shared/lib/deploy_operator
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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() {
Expand Down

0 comments on commit 308cf1b

Please sign in to comment.