From 79f29dda2370b7eec9942405d45541f1f569d0f9 Mon Sep 17 00:00:00 2001
From: Stefan Scherer <scherer_stefan@icloud.com>
Date: Sat, 21 Sep 2019 17:40:58 +0200
Subject: [PATCH 1/2] Add dependencies for ARM build

Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
---
 Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a5398413c..64de77890 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,15 +30,18 @@ RUN apk add --no-cache \
 ENV BUILD_BOOTLOADER=1
 
 FROM python:${PYTHON_VERSION}-${BUILD_DEBIAN_VERSION} AS build-debian
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install --no-install-recommends -y \
     curl \
     gcc \
     git \
     libc-dev \
+    libffi-dev \
     libgcc-6-dev \
+    libssl-dev \
     make \
     openssl \
-    python2.7-dev
+    python2.7-dev \
+    zlib1g-dev
 
 FROM build-${BUILD_PLATFORM} AS build
 COPY docker-compose-entrypoint.sh /usr/local/bin/

From ce52f597a0f0a509912b91befe59991906391028 Mon Sep 17 00:00:00 2001
From: Stefan Scherer <stefan.scherer@docker.com>
Date: Mon, 23 Sep 2019 10:36:47 +0200
Subject: [PATCH 2/2] Enhance build script for different CPU architectures

Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
---
 script/build/linux | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/build/linux b/script/build/linux
index 28065da08..ca5620b85 100755
--- a/script/build/linux
+++ b/script/build/linux
@@ -12,6 +12,7 @@ docker build -t "${TAG}" . \
        --build-arg GIT_COMMIT="${DOCKER_COMPOSE_GITSHA}"
 TMP_CONTAINER=$(docker create "${TAG}")
 mkdir -p dist
-docker cp "${TMP_CONTAINER}":/usr/local/bin/docker-compose dist/docker-compose-Linux-x86_64
+ARCH=$(uname -m)
+docker cp "${TMP_CONTAINER}":/usr/local/bin/docker-compose "dist/docker-compose-Linux-${ARCH}"
 docker container rm -f "${TMP_CONTAINER}"
 docker image rm -f "${TAG}"