Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align instance ID when it is non-default #130

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions bin/convert-env.sh
Expand Up @@ -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" ]
Expand Down