From 17588982762cb3c3e1d0d776aab97e55427390e6 Mon Sep 17 00:00:00 2001
From: Jay MOULIN <jmoulin@castelis.com>
Date: Wed, 6 Dec 2017 12:06:27 +0100
Subject: [PATCH] Fixes tini architecture

---
 Dockerfile | 14 ++++++++------
 Makefile   |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c618b67..c531982 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ COPY qemu-*-static /usr/bin/
 
 FROM builder
 
+ARG ARCH=armhf
 LABEL maintainer="Jay MOULIN <jaymoulin@gmail.com> <https://twitter.com/MoulinJay>"
 
 # archive extraction uses sevenzipjbinding library
@@ -11,16 +12,17 @@ LABEL maintainer="Jay MOULIN <jaymoulin@gmail.com> <https://twitter.com/MoulinJa
 RUN mkdir -p /opt/JDownloader/
 RUN apk add --update libstdc++ ffmpeg && apk add wget  --virtual .build-deps && \
     wget -O /opt/JDownloader/JDownloader.jar "http://installer.jdownloader.org/JDownloader.jar?$RANDOM" && chmod +x /opt/JDownloader/JDownloader.jar && \
-    wget -O /sbin/tini "https://github.com/krallin/tini/releases/download/v0.16.1/tini-static-armhf" --no-check-certificate && chmod +x /sbin/tini && \
-    apk del wget --purge .build-deps
+    wget -O /usr/bin/tini "https://github.com/krallin/tini/releases/download/v0.16.1/tini-static-${ARCH}" --no-check-certificate && chmod +x /usr/bin/tini && \
+    apk del wget --purge .build-deps && \
+    rm /usr/bin/qemu-*-static
 ENV LD_LIBRARY_PATH=/lib;/lib32;/usr/lib
 
-ADD daemon.sh /opt/JDownloader/
-ADD default-config.json.dist /opt/JDownloader/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json.dist
-ADD configure.sh /usr/bin/configure
+COPY daemon.sh /opt/JDownloader/
+COPY default-config.json.dist /opt/JDownloader/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json.dist
+COPY configure.sh /usr/bin/configure
 
 VOLUME /root/Downloads
 VOLUME /opt/JDownloader/cfg
 WORKDIR /opt/JDownloader
 
-CMD ["/sbin/tini", "--", "/opt/JDownloader/daemon.sh"]
+CMD ["tini", "--", "/opt/JDownloader/daemon.sh"]
diff --git a/Makefile b/Makefile
index 78130d0..338fcec 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,9 @@ build:
 	cp /usr/bin/qemu-arm-static .
 	cp /usr/bin/qemu-aarch64-static .
 	$(foreach arch,$(archs), \
+		if [ $(arch) = arm32v6 ]; then archi=armhf; elif [ $(arch) = arm64v8 ]; then archi=arm64; else archi=$(arch); fi; \
 		cat Dockerfile | sed "s/FROM openjdk:jre-alpine/FROM ${arch}\/openjdk:jre-alpine/g" > .Dockerfile; \
-		docker build -t jaymoulin/jdownloader:${VERSION}-$(arch) -f .Dockerfile ${CACHE} .;\
+		docker build -t jaymoulin/jdownloader:${VERSION}-$(arch) -f .Dockerfile --build-arg ARCH=$${archi} ${CACHE} .;\
 	)
 publish:
 	docker push jaymoulin/jdownloader