From 3a108658247c59bd9f40a6f0d6eb7229ce535403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bondis?= <aurelien.bondis@gmail.com>
Date: Sun, 31 Mar 2019 01:06:42 -0400
Subject: [PATCH] install python for setup image, accept args for build_arm
 script

---
 setup/Dockerfile   | 7 ++++---
 tests/build_arm.sh | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/setup/Dockerfile b/setup/Dockerfile
index 7c4ba773..101fc36a 100644
--- a/setup/Dockerfile
+++ b/setup/Dockerfile
@@ -1,11 +1,12 @@
-FROM python:3-alpine
+ARG DISTRO=alpine:3.8
+FROM $DISTRO
 
 RUN mkdir -p /app
 WORKDIR /app
 
 COPY requirements.txt requirements.txt
-RUN apk add --no-cache curl \
- && pip install -r requirements.txt
+RUN apk add --no-cache curl python3 py3-pip
+RUN pip3 install -r requirements.txt
 
 COPY server.py ./server.py
 COPY main.py ./main.py
diff --git a/tests/build_arm.sh b/tests/build_arm.sh
index f93c4f6b..c382095b 100755
--- a/tests/build_arm.sh
+++ b/tests/build_arm.sh
@@ -6,4 +6,4 @@ QEMU="$(which qemu-arm-static)"
 cp $QEMU ../webmails/rainloop/
 cp $QEMU ../webmails/roundcube/
 
-docker-compose -f build.yml build --build-arg DISTRO=$DISTRO --build-arg PHP_DISTRO=$PHP # --parallel
+docker-compose -f build.yml build --build-arg DISTRO=$DISTRO --build-arg PHP_DISTRO=$PHP $@  # --parallel