Merge pull request #130 from 1000TurquoisePogs/bugfix/align-instance-id

Align instance ID when it is non-default
zowe · Jul 21, 2020 · c7cbb5d · c7cbb5d
2 parents 5422616 + 49b4f4c
commit c7cbb5d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 All notable changes to the Zlux App Server package will be documented in this file.
 
-## Recent Changes
+## v1.13.0
+
+- Align app server's instance ID parameter to the Zowe Instance value
+
+## v1.12.0
 
 - Add v1.12 update script for replacing all bundled plugin references with ones that use $ROOT_DIR environment variable
 - Change Scripts to work with independent zss component

diff --git a/bin/convert-env.sh b/bin/convert-env.sh
@@ -7,6 +7,15 @@
 #
 # Copyright Contributors to the Zowe Project.
 
+# For backwards compatible behavior, only set the instance ID if it is non-default
+if [ -n "$ZOWE_INSTANCE" ]
+then
+    if [ "$ZOWE_INSTANCE" != "1" ]
+    then
+        export ZWED_instanceID=$ZOWE_INSTANCE
+    fi
+fi
+
 # shape old env vars into app-server compatible ones
 # mediation layer
 if [ -z "$ZWED_node_mediationLayer_server_gatewayPort" ]