From 45e970e18a6fe79d2be42aeb07741c994a4dce9a Mon Sep 17 00:00:00 2001
From: Arthur Barr <arthurbarr@users.noreply.github.com>
Date: Thu, 31 May 2018 10:52:54 +0100
Subject: [PATCH] Change apt URL for non-x86_64 platforms (#97)

---
 Makefile      |  1 -
 install-mq.sh | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 198ba3f..e79bd24 100644
--- a/Makefile
+++ b/Makefile
@@ -225,7 +225,6 @@ build-advancedserver: downloads/$(MQ_ARCHIVE) docker-version
 # Target-specific variable to add web server into devserver image
 build-devserver: MQ_PACKAGES=ibmmq-server ibmmq-java ibmmq-jre ibmmq-gskit ibmmq-msg-.* ibmmq-samples ibmmq-ams ibmmq-web
 build-devserver: downloads/$(MQ_ARCHIVE_DEV) docker-version
-	@test "$(shell uname -m)" = "x86_64" || (echo "Error: MQ Advanced for Developers is only available for x86_64 architecture" && exit 1)
 	$(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_DEVSERVER_BASE)"$(END)))
 	$(call docker-build-mq,$(MQ_IMAGE_DEVSERVER_BASE),Dockerfile-server,$(MQ_ARCHIVE_DEV),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)",$(MQ_VERSION))
 	docker build --tag $(MQ_IMAGE_DEVSERVER) --file incubating/mqadvanced-server-dev/Dockerfile .
diff --git a/install-mq.sh b/install-mq.sh
index d828349..ef71448 100644
--- a/install-mq.sh
+++ b/install-mq.sh
@@ -32,9 +32,18 @@ if ($UBUNTU); then
   # Use a reduced set of apt repositories.
   # This ensures no unsupported code gets installed, and makes the build faster
   source /etc/os-release
-  echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME} main restricted" > /etc/apt/sources.list
-  echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-updates main restricted" >> /etc/apt/sources.list
-  echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-security main restricted" >> /etc/apt/sources.list
+  # Figure out the correct apt URL based on the CPU architecture
+  CPU_ARCH=$(uname -p)
+  if [ ${CPU_ARCH} == "x86_64" ]; then
+     APT_URL="http://archive.ubuntu.com/ubuntu/"
+  else
+     APT_URL="http://ports.ubuntu.com/ubuntu-ports/"
+  fi
+  # Use a reduced set of apt repositories.
+  # This ensures no unsupported code gets installed, and makes the build faster
+  echo "deb ${APT_URL} ${UBUNTU_CODENAME} main restricted" > /etc/apt/sources.list
+  echo "deb ${APT_URL} ${UBUNTU_CODENAME}-updates main restricted" >> /etc/apt/sources.list
+  echo "deb ${APT_URL} ${UBUNTU_CODENAME}-security main restricted" >> /etc/apt/sources.list
   # Install additional packages required by MQ, this install process and the runtime scripts
   apt-get update
   apt-get install -y --no-install-recommends \