From 813e1c586b27ae968bc86393848273810dedd71a Mon Sep 17 00:00:00 2001
From: Clemens Wolff <clewolff@microsoft.com>
Date: Thu, 28 Mar 2019 12:58:02 -0400
Subject: [PATCH] Move build of setup image into docker-compose

---
 README.rst            | 4 +---
 docker-compose.yml    | 7 +++++++
 docker/setup/setup.sh | 5 +++++
 travis/cd.sh          | 7 ++-----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index 33cc8eb6..9baf85a3 100644
--- a/README.rst
+++ b/README.rst
@@ -159,9 +159,7 @@ to initialize the required cloud resources.
   REGISTRATION_PASSWORD={some password for the registration endpoint}
   EOM
 
-  docker build -t setup -f docker/setup/Dockerfile .
-
-  docker run \
+  docker-compose run \
     -e SP_APPID={appId field of your service principal} \
     -e SP_PASSWORD={password field of your service principal} \
     -e SP_TENANT={tenant field of your service principal} \
diff --git a/docker-compose.yml b/docker-compose.yml
index 2c3d0736..228febda 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -80,6 +80,13 @@ services:
       - azurite
       - rabbitmq
 
+  setup:
+    image: ${DOCKER_REPO}/opwenserver_setup:${BUILD_TAG}
+    build:
+      context: .
+      dockerfile: docker/setup/Dockerfile
+    command: /app/setup.sh --help
+
   rabbitmq:
     image: rabbitmq:3.7.8-management
 
diff --git a/docker/setup/setup.sh b/docker/setup/setup.sh
index 9c4eda51..e07928e6 100755
--- a/docker/setup/setup.sh
+++ b/docker/setup/setup.sh
@@ -31,6 +31,11 @@ scriptname="${BASH_SOURCE[0]}"
 # shellcheck disable=SC1090
 . "${scriptdir}/utils.sh"
 
+if [[ "$1" = "--help" ]]; then
+  usage "${scriptname}"
+  exit 0
+fi
+
 #
 # verify inputs
 #
diff --git a/travis/cd.sh b/travis/cd.sh
index 1e64be84..056eb871 100755
--- a/travis/cd.sh
+++ b/travis/cd.sh
@@ -19,9 +19,6 @@ docker login --username="$DOCKER_USERNAME" --password="$DOCKER_PASSWORD"
 for tag in "latest" "$TRAVIS_TAG"; do
   BUILD_TAG="$tag" DOCKER_REPO="$DOCKER_USERNAME" docker-compose build
   BUILD_TAG="$tag" DOCKER_REPO="$DOCKER_USERNAME" docker-compose push
-
-  docker build -t "$DOCKER_USERNAME/opwenserver_setup:$tag" -f "./docker/setup/Dockerfile" "."
-  docker push "$DOCKER_USERNAME/opwenserver_setup:$tag"
 done
 
 #
@@ -35,13 +32,13 @@ fi
 kubeconfig_path="$PWD/kube-config"
 curl -sfL "$KUBECONFIG_URL" -o "$kubeconfig_path"
 
-docker run \
+docker-compose run \
   -e IMAGE_REGISTRY="$DOCKER_USERNAME" \
   -e DOCKER_TAG="$TRAVIS_TAG" \
   -e HELM_NAME="$HELM_NAME" \
   -e LOKOLE_DNS_NAME="$LOKOLE_DNS_NAME" \
   -v "$kubeconfig_path:/secrets/kube-config" \
-  "$DOCKER_USERNAME/opwenserver_setup:$TRAVIS_TAG" \
+  setup \
   /app/upgrade.sh
 
 rm "$kubeconfig_path"