diff --git a/cli/basic-with-nvm/install_zowe.sh b/cli/basic-with-nvm/install_zowe.sh index bd7456c..b57fd28 100755 --- a/cli/basic-with-nvm/install_zowe.sh +++ b/cli/basic-with-nvm/install_zowe.sh @@ -27,7 +27,8 @@ npm config set @zowe:registry https://zowe.jfrog.io/zowe/api/npm/npm-local-relea rm -rf ~/.zowe/plugins npm install -g @zowe/cli@${PKG_TAG} -plugins=( @zowe/zos-ftp-for-zowe-cli@${PKG_TAG} @zowe/cics-for-zowe-cli@${PKG_TAG} @zowe/db2-for-zowe-cli@${PKG_TAG} @zowe/ims-for-zowe-cli@${PKG_TAG} @zowe/mq-for-zowe-cli@${PKG_TAG}) +plugins=( @zowe/zos-ftp-for-zowe-cli@${PKG_TAG} @zowe/cics-for-zowe-cli@${PKG_TAG} @zowe/ims-for-zowe-cli@${PKG_TAG} @zowe/mq-for-zowe-cli@${PKG_TAG}) +noarm_plugins=( @zowe/db2-for-zowe-cli@${PKG_TAG} ) for i in "${plugins[@]}"; do if [ ! -z "${ALLOW_PLUGIN_INSTALL_FAIL}" ]; then @@ -37,4 +38,24 @@ for i in "${plugins[@]}"; do fi done +if uname -m | grep -q 'arm'; then + echo "Unable to install the following plug-ins due to CPU architecture:" + for i in "${noarm_plugins[@]}"; do + echo $i + done +elif uname -m | grep -q 'aarch'; then + echo "Unable to install the following plug-ins due to CPU architecture:" + for i in "${noarm_plugins[@]}"; do + echo $i + done +else + for i in "${noarm_plugins[@]}"; do + if [ ! -z "${ALLOW_PLUGIN_INSTALL_FAIL}" ]; then + zowe plugins install $i || true + else + zowe plugins install $i || exit 1 + fi + done +fi + exit 0 diff --git a/cli/basic/install_zowe.sh b/cli/basic/install_zowe.sh index f942fba..db1606a 100755 --- a/cli/basic/install_zowe.sh +++ b/cli/basic/install_zowe.sh @@ -22,7 +22,8 @@ npm config set @zowe:registry https://zowe.jfrog.io/zowe/api/npm/npm-local-relea rm -rf ~/.zowe/plugins npm install -g @zowe/cli@${PKG_TAG} -plugins=( @zowe/zos-ftp-for-zowe-cli@${PKG_TAG} @zowe/cics-for-zowe-cli@${PKG_TAG} @zowe/db2-for-zowe-cli@${PKG_TAG} @zowe/ims-for-zowe-cli@${PKG_TAG} @zowe/mq-for-zowe-cli@${PKG_TAG}) +plugins=( @zowe/zos-ftp-for-zowe-cli@${PKG_TAG} @zowe/cics-for-zowe-cli@${PKG_TAG} @zowe/ims-for-zowe-cli@${PKG_TAG} @zowe/mq-for-zowe-cli@${PKG_TAG}) +noarm_plugins=( @zowe/db2-for-zowe-cli@${PKG_TAG} ) for i in "${plugins[@]}"; do if [ ! -z "${ALLOW_PLUGIN_INSTALL_FAIL}" ]; then @@ -32,4 +33,24 @@ for i in "${plugins[@]}"; do fi done +if uname -m | grep -q 'arm'; then + echo "Unable to install the following plug-ins due to CPU architecture:" + for i in "${noarm_plugins[@]}"; do + echo $i + done +elif uname -m | grep -q 'aarch'; then + echo "Unable to install the following plug-ins due to CPU architecture:" + for i in "${noarm_plugins[@]}"; do + echo $i + done +else + for i in "${noarm_plugins[@]}"; do + if [ ! -z "${ALLOW_PLUGIN_INSTALL_FAIL}" ]; then + zowe plugins install $i || true + else + zowe plugins install $i || exit 1 + fi + done +fi + exit 0 diff --git a/cli/jenkins-agent/install_zowe.sh b/cli/jenkins-agent/install_zowe.sh index bd7456c..b57fd28 100755 --- a/cli/jenkins-agent/install_zowe.sh +++ b/cli/jenkins-agent/install_zowe.sh @@ -27,7 +27,8 @@ npm config set @zowe:registry https://zowe.jfrog.io/zowe/api/npm/npm-local-relea rm -rf ~/.zowe/plugins npm install -g @zowe/cli@${PKG_TAG} -plugins=( @zowe/zos-ftp-for-zowe-cli@${PKG_TAG} @zowe/cics-for-zowe-cli@${PKG_TAG} @zowe/db2-for-zowe-cli@${PKG_TAG} @zowe/ims-for-zowe-cli@${PKG_TAG} @zowe/mq-for-zowe-cli@${PKG_TAG}) +plugins=( @zowe/zos-ftp-for-zowe-cli@${PKG_TAG} @zowe/cics-for-zowe-cli@${PKG_TAG} @zowe/ims-for-zowe-cli@${PKG_TAG} @zowe/mq-for-zowe-cli@${PKG_TAG}) +noarm_plugins=( @zowe/db2-for-zowe-cli@${PKG_TAG} ) for i in "${plugins[@]}"; do if [ ! -z "${ALLOW_PLUGIN_INSTALL_FAIL}" ]; then @@ -37,4 +38,24 @@ for i in "${plugins[@]}"; do fi done +if uname -m | grep -q 'arm'; then + echo "Unable to install the following plug-ins due to CPU architecture:" + for i in "${noarm_plugins[@]}"; do + echo $i + done +elif uname -m | grep -q 'aarch'; then + echo "Unable to install the following plug-ins due to CPU architecture:" + for i in "${noarm_plugins[@]}"; do + echo $i + done +else + for i in "${noarm_plugins[@]}"; do + if [ ! -z "${ALLOW_PLUGIN_INSTALL_FAIL}" ]; then + zowe plugins install $i || true + else + zowe plugins install $i || exit 1 + fi + done +fi + exit 0 diff --git a/cli/minimal/Dockerfile b/cli/minimal/Dockerfile index 5a38659..298df4e 100644 --- a/cli/minimal/Dockerfile +++ b/cli/minimal/Dockerfile @@ -23,7 +23,8 @@ RUN apt-get update && apt-get install -y curl build-essential python3 && curl -f # Install Zowe CLI RUN npm install -g @zowe/cli@${ZOWE_VERSION} --ignore-scripts USER zowe -RUN zowe plugins install @zowe/cics-for-zowe-cli@${ZOWE_VERSION} @zowe/db2-for-zowe-cli@${ZOWE_VERSION} @zowe/ims-for-zowe-cli@${ZOWE_VERSION} @zowe/mq-for-zowe-cli@${ZOWE_VERSION} @zowe/zos-ftp-for-zowe-cli@${ZOWE_VERSION} +RUN zowe plugins install @zowe/cics-for-zowe-cli@${ZOWE_VERSION} @zowe/ims-for-zowe-cli@${ZOWE_VERSION} @zowe/mq-for-zowe-cli@${ZOWE_VERSION} @zowe/zos-ftp-for-zowe-cli@${ZOWE_VERSION} +RUN if uname -m | grep -q 'arm'; then echo "Unable to install the DB2 Plug-in due to CPU architecture"; elif uname -m | grep -q 'aarch'; then echo "Unable to install the DB2 Plug-in due to CPU architecture"; else zowe plugins install @zowe/db2-for-zowe-cli@${ZOWE_VERSION}; fi RUN mkdir -p ~/.zowe/settings && echo '{"overrides":{"CredentialManager":false}}' > ~/.zowe/settings/imperative.json # Uncomment to enable daemon mode by default