From 61558af97c4c2f317587981ead93620998a71cad Mon Sep 17 00:00:00 2001
From: Chmouel Boudjnah <chmouel@chmouel.com>
Date: Thu, 29 Nov 2018 15:42:56 +0100
Subject: [PATCH] Deploy wit in deploy-openshift-dev.sh script

---
 Makefile                          |  9 +++------
 openshift/deploy-openshift-dev.sh | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 501a877..4c19569 100644
--- a/Makefile
+++ b/Makefile
@@ -41,16 +41,13 @@ AUTH_CONTAINER_NAME = auth
 AUTH_CONTAINER_PORT = 8089
 AUTH_CONTAINER_IMAGE = quay.io/openshiftio/fabric8-services-fabric8-auth:latest
 
-AUTH_DB_CONTAINER_NAME = db-auth
-AUTH_DB_CONTAINER_IMAGE = $(DB_CONTAINER_IMAGE)
-
 # Env
 ENV_CONTAINER_NAME = f8env
-ENV_CONTAINER_PORT = 8080
 ENV_CONTAINER_IMAGE = quay.io/openshiftio/fabric8-services-fabric8-env:latest
 
-ENV_DB_CONTAINER_NAME = db-env
-ENV_DB_CONTAINER_IMAGE = $(DB_CONTAINER_IMAGE)
+# Wit
+WIT_CONTAINER_NAME = f8wit
+WIT_CONTAINER_IMAGE = quay.io/openshiftio/fabric8-services-fabric8-wit:latest
 
 # By default reduce the amount of log output from tests, set this to debug and GO_TEST_VERBOSITY_FLAG to -v to increase it
 F8_LOG_LEVEL ?= error
diff --git a/openshift/deploy-openshift-dev.sh b/openshift/deploy-openshift-dev.sh
index 9bf4682..061333a 100755
--- a/openshift/deploy-openshift-dev.sh
+++ b/openshift/deploy-openshift-dev.sh
@@ -13,7 +13,7 @@ set -ex
 function readlinkf() { python -c 'import os,sys;print(os.path.realpath(sys.argv[1]))' $1 ;}
 cd $(dirname $(readlinkf $0))/../
 
-eval $(make print-env|egrep '^(REGISTRY_URL|AUTH|DB|ENV).*(IMAGE|PORT|NAME)')
+eval $(make print-env|egrep '^(REGISTRY_URL|WIT|AUTH|DB|ENV).*(IMAGE|PORT|NAME)')
 
 oc whoami 2>/dev/null >/dev/null || { echo "oc does not seem to be configured properly"; exit 1 ;}
 
@@ -130,6 +130,18 @@ EOF
 )
 deploy_sideservice ${ENV_CONTAINER_NAME} ${ENV_CONTAINER_IMAGE} "${ENV_SERVICE_VARIABLES}"
 
+# WIT
+WIT_SERVICE_VARIABLES=$(cat <<EOF
+-e F8_LOG_LEVEL=debug
+-e F8_POSTGRES_HOST=${DC_DB}
+-e F8_POSTGRES_DATABASE=wit
+-e F8_POSTGRES_PORT=5432
+-e F8_DEVELOPER_MODE_ENABLED=true
+-e F8_AUTH_URL=http://${AUTH_CONTAINER_NAME}:${AUTH_CONTAINER_PORT}
+EOF
+)
+deploy_sideservice ${WIT_CONTAINER_NAME} ${WIT_CONTAINER_IMAGE} "${WIT_SERVICE_VARIABLES}"
+
 
 # Build
 deploy_app