From eece3d893b31c12928978529c4630ce6be83fbd7 Mon Sep 17 00:00:00 2001 From: rameshthoomu Date: Sun, 23 Sep 2018 11:40:37 -0400 Subject: [PATCH] FAB-12106 Update fabric-ca build scripts Update fabric-ca build scripts to download s390x binary to run the fabric-ca test scripts Change-Id: Ieaeac4a7e43435dbf49e6b9dc2649705e9348892 Signed-off-by: rameshthoomu --- fabric-ca/makeDocker.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fabric-ca/makeDocker.sh b/fabric-ca/makeDocker.sh index 51b744fe5d..3e2feae9a7 100755 --- a/fabric-ca/makeDocker.sh +++ b/fabric-ca/makeDocker.sh @@ -16,10 +16,9 @@ export FABRIC_TAG=${FABRIC_TAG:-1.2.0} export FABRIC_CA_TAG=${FABRIC_CA_TAG:-${FABRIC_TAG}} export NS=${NS:-hyperledger} - -export ARCH="linux-amd64" # Docker images run on linux -CA_BINARY_FILE=hyperledger-fabric-ca-${ARCH}-${FABRIC_CA_TAG}.tar.gz -URL=https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric-ca/hyperledger-fabric-ca/${ARCH}-${FABRIC_CA_TAG}/${CA_BINARY_FILE} +export MARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')" | awk '{print tolower($0)}') +CA_BINARY_FILE=hyperledger-fabric-ca-${MARCH}-${FABRIC_CA_TAG}.tar.gz +URL=https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric-ca/hyperledger-fabric-ca/${MARCH}-${FABRIC_CA_TAG}/${CA_BINARY_FILE} SDIR=$(dirname "$0") source $SDIR/scripts/env.sh