From 7ca89435c6b7a6909e6b600ece002fff97b9f7e2 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 17 Jan 2018 11:24:36 -0700
Subject: [PATCH 1/3] added configuration options for webpack

---
 Dockerfile.onbuild |  1 +
 webpack.config.js  | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.onbuild b/Dockerfile.onbuild
index 20d34ffb9..dab06f336 100644
--- a/Dockerfile.onbuild
+++ b/Dockerfile.onbuild
@@ -5,6 +5,7 @@ ONBUILD ARG TALK_THREADING_LEVEL=3
 ONBUILD ARG TALK_DEFAULT_STREAM_TAB=all
 ONBUILD ARG TALK_DEFAULT_LANG=en
 ONBUILD ARG TALK_PLUGINS_JSON
+ONBUILD ARG TALK_WEBPACK_SOURCE_MAP
 
 # Bundle app source
 ONBUILD COPY . /usr/src/app
diff --git a/webpack.config.js b/webpack.config.js
index cb3327fe7..bbb4abee7 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -22,12 +22,27 @@ const buildTargets = ['coral-admin', 'coral-docs'];
 
 const buildEmbeds = ['stream'];
 
+// In production, default turn off source maps. In development, default use
+// 'cheap-module-source-map'.
+const devtool =
+  process.env.NODE_ENV === 'production'
+    ? process.env.TALK_WEBPACK_SOURCE_MAP
+      ? process.env.TALK_WEBPACK_SOURCE_MAP === 'none'
+        ? false
+        : process.env.TALK_WEBPACK_SOURCE_MAP
+      : false
+    : process.env.TALK_WEBPACK_SOURCE_MAP
+      ? process.env.TALK_WEBPACK_SOURCE_MAP === 'none'
+        ? false
+        : process.env.TALK_WEBPACK_SOURCE_MAP
+      : 'cheap-module-source-map';
+
 //==============================================================================
 // Base Webpack Config
 //==============================================================================
 
 const config = {
-  devtool: 'cheap-module-source-map',
+  devtool,
   target: 'web',
   output: {
     path: path.join(__dirname, 'dist'),

From 68598d3c458a308b5a96a6d9649cfcd616b6c80e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 17 Jan 2018 11:34:09 -0700
Subject: [PATCH 2/3] cleanup for logic

---
 webpack.config.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index bbb4abee7..270417148 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -24,18 +24,21 @@ const buildEmbeds = ['stream'];
 
 // In production, default turn off source maps. In development, default use
 // 'cheap-module-source-map'.
+const DEFAULT_WEBPACK_SOURCE_MAP =
+  process.env.NODE_ENV === 'production' ? 'none' : 'cheap-module-source-map';
+
+// TALK_WEBPACK_SOURCE_MAP is sourced from the environment, defaulting based on
+// the environment.
+const TALK_WEBPACK_SOURCE_MAP = _.get(
+  process.env,
+  'TALK_WEBPACK_SOURCE_MAP',
+  DEFAULT_WEBPACK_SOURCE_MAP
+);
+
+// Set the devtool based on the source map selection, 'none' just means turn off
+// source maps.
 const devtool =
-  process.env.NODE_ENV === 'production'
-    ? process.env.TALK_WEBPACK_SOURCE_MAP
-      ? process.env.TALK_WEBPACK_SOURCE_MAP === 'none'
-        ? false
-        : process.env.TALK_WEBPACK_SOURCE_MAP
-      : false
-    : process.env.TALK_WEBPACK_SOURCE_MAP
-      ? process.env.TALK_WEBPACK_SOURCE_MAP === 'none'
-        ? false
-        : process.env.TALK_WEBPACK_SOURCE_MAP
-      : 'cheap-module-source-map';
+  TALK_WEBPACK_SOURCE_MAP === 'none' ? false : TALK_WEBPACK_SOURCE_MAP;
 
 //==============================================================================
 // Base Webpack Config

From 4960b34748d2e33f1e67b5d6e41a3ff83acc0f8a Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 17 Jan 2018 14:56:36 -0700
Subject: [PATCH 3/3] fixed deploy script

---
 scripts/docker.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/scripts/docker.sh b/scripts/docker.sh
index e1e3f9725..06f0cb279 100755
--- a/scripts/docker.sh
+++ b/scripts/docker.sh
@@ -68,17 +68,16 @@ then
     docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
   fi
 
-  if [ "$CIRCLE_BRANCH" = "master" ]
+  # deploy based on the env
+  if [ -n "$CIRCLE_TAG" ]
   then
-
-    # deploy based on the env
-    if [ -n "$CIRCLE_TAG" ]
-    then
-      deploy_tag
-    else
-      deploy_latest
-    fi
+    deploy_tag
   else
-    deploy_branch
+    if [ "$CIRCLE_BRANCH" = "master" ]
+    then
+      deploy_latest
+    else
+      deploy_branch
+    fi
   fi
 fi
\ No newline at end of file