Merge pull request #24 from linuxserver/qemu-bionic

removing ability to build base images on x86 and ripping out single qemu layer
pull/30/head 2e919e3c-pkg-2e919e3c-ls4
aptalca 2019-04-15 19:52:45 -04:00 zatwierdzone przez GitHub
commit 5b8f551b65
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 10 dodań i 4 usunięć

Wyświetl plik

@ -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 \

Wyświetl plik

@ -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 \