From 046e9b87c57ac483172867f766e0f8046e5ea520 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Mon, 15 Apr 2019 15:48:15 -0700
Subject: [PATCH] removing ability to build base images on x86 and ripping out
single qemu layer
---
Dockerfile.aarch64 | 7 +++++--
Dockerfile.armhf | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d8f44b1..b136849 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -25,8 +25,6 @@ RUN \
# Runtime stage
FROM scratch
COPY --from=rootfs-stage /root-out/ /
-# Add qemu to run on x86_64 systems
-COPY qemu-aarch64-static /usr/bin
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL MAINTAINER="sparkyballs,TheLamer"
@@ -101,6 +99,11 @@ RUN \
/app \
/config \
/defaults && \
+ echo "**** add qemu ****" && \
+ curl -o \
+ /usr/bin/qemu-aarch64-static -L \
+ "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \
+ chmod +x /usr/bin/qemu-aarch64-static && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index c8b3cb4..b5e1de1 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -25,8 +25,6 @@ RUN \
# Runtime stage
FROM scratch
COPY --from=rootfs-stage /root-out/ /
-# Add qemu to build on x86_64 systems
-COPY qemu-arm-static /usr/bin
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL MAINTAINER="sparkyballs,TheLamer"
@@ -101,6 +99,11 @@ RUN \
/app \
/config \
/defaults && \
+ echo "**** add qemu ****" && \
+ curl -o \
+ /usr/bin/qemu-arm-static -L \
+ "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static" && \
+ chmod +x /usr/bin/qemu-arm-static && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
--
GitLab