Merge "[CE-201] Enable s390x in cello"

hyperledger-cello · Dec 18, 2017 · ed10423 · ed10423
2 parents ddb0267 + 4addfe1
commit ed10423
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ IS_RELEASE=false
 
 DOCKER_BASE_x86_64=ubuntu:xenial
 DOCKER_BASE_ppc64le=ppc64le/ubuntu:xenial
-#DOCKER_BASE_s390x=s390x/debian:jessie
+DOCKER_BASE_s390x=s390x/debian:jessie
 DOCKER_BASE=$(DOCKER_BASE_$(ARCH))
 BASE_VERSION ?= $(ARCH)-$(VERSION)
 

diff --git a/baseimage/install.sh b/baseimage/install.sh
@@ -40,14 +40,18 @@ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A145185
 
 echo "deb [ arch=amd64,arm64,ppc64el,s390x ] http://repo.mongodb.com/apt/ubuntu xenial/mongodb-enterprise/3.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-enterprise.list
 
+if [ $(dpkg --print-architecture) == "s390x" ]; then
+	echo "deb [ arch=s390x ] http://deb.debian.org/debian stable main" >> /etc/apt/sources.list
+fi
+
 apt-get update
 
 export MONGO_PACKAGE=mongodb-enterprise
 # export MONGO_REPO=repo.mongodb.com
 # export MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
 
 export MONGO_MAJOR=3.4
-export MONGO_VERSION=3.4.10
+export MONGO_VERSION=3.4.9
 
 apt-get install -y \
 		${MONGO_PACKAGE}=$MONGO_VERSION \