From 56843d431965a86f92ba1869819c00f6c8eaca5b Mon Sep 17 00:00:00 2001
From: Dennis Chen <dennis.chen@arm.com>
Date: Fri, 9 Mar 2018 06:09:59 +0000
Subject: [PATCH] Multiarch support for Dockerfile

This PR consolidates the existing arch-specific Dockerfiles into only
one file `Dockefile` to ease the code maintenance effort.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Upstream-commit: f1701a741d77a92d28138944193e23aabfc74abe
Component: engine
---
 components/engine/Dockerfile | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile
index 20fac46a33..63e2dc3f00 100644
--- a/components/engine/Dockerfile
+++ b/components/engine/Dockerfile
@@ -44,7 +44,9 @@ FROM base AS criu
 # Install CRIU for checkpoint/restore support
 ENV CRIU_VERSION 3.6
 # Install dependancy packages specific to criu
-RUN apt-get update && apt-get install -y \
+RUN case $(uname -m) in \
+    x86_64) \
+	apt-get update && apt-get install -y \
 	libnet-dev \
 	libprotobuf-c0-dev \
 	libprotobuf-dev \
@@ -57,7 +59,12 @@ RUN apt-get update && apt-get install -y \
 	&& curl -sSL https://github.com/checkpoint-restore/criu/archive/v${CRIU_VERSION}.tar.gz | tar -C /usr/src/criu/ -xz --strip-components=1 \
 	&& cd /usr/src/criu \
 	&& make \
-	&& make PREFIX=/opt/criu install-criu
+	&& make PREFIX=/opt/criu install-criu ;\
+	;; \
+    armv7l|aarch64|ppc64le|s390x) \
+	mkdir -p /opt/criu; \
+	;; \
+    esac
 
 
 FROM base AS registry
@@ -73,9 +80,13 @@ RUN set -x \
 	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \
 	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
 		go build -buildmode=pie -o /usr/local/bin/registry-v2 github.com/docker/distribution/cmd/registry \
-	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1") \
-	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
-		go build -buildmode=pie -o /usr/local/bin/registry-v2-schema1 github.com/docker/distribution/cmd/registry \
+	&& case $(uname -m) in \
+		x86_64|ppc64le|s390x) \
+		(cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1"); \
+		GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH"; \
+			go build -buildmode=pie -o /usr/local/bin/registry-v2-schema1 github.com/docker/distribution/cmd/registry; \
+		;; \
+	   esac \
 	&& rm -rf "$GOPATH"
 
 
@@ -207,7 +218,7 @@ RUN apt-get update && apt-get install -y \
 	libudev-dev \
 	libsystemd-dev \
 	binutils-mingw-w64 \
-	g++-mingw-w64-x86-64 \ 
+	g++-mingw-w64-x86-64 \
 	net-tools \
 	pigz \
 	python-backports.ssl-match-hostname \