Skip to content
Snippets Groups Projects
Unverified Commit 5b8f551b authored by aptalca's avatar aptalca Committed by GitHub
Browse files

Merge pull request #24 from linuxserver/qemu-bionic

removing ability to build base images on x86 and ripping out single qemu layer
parents 0ff53ccf 046e9b87
No related branches found
No related tags found
No related merge requests found
...@@ -25,8 +25,6 @@ RUN \ ...@@ -25,8 +25,6 @@ RUN \
# Runtime stage # Runtime stage
FROM scratch FROM scratch
COPY --from=rootfs-stage /root-out/ / 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 build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL MAINTAINER="sparkyballs,TheLamer" LABEL MAINTAINER="sparkyballs,TheLamer"
...@@ -101,6 +99,11 @@ RUN \ ...@@ -101,6 +99,11 @@ RUN \
/app \ /app \
/config \ /config \
/defaults && \ /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 ****" && \ echo "**** cleanup ****" && \
apt-get clean && \ apt-get clean && \
rm -rf \ rm -rf \
......
...@@ -25,8 +25,6 @@ RUN \ ...@@ -25,8 +25,6 @@ RUN \
# Runtime stage # Runtime stage
FROM scratch FROM scratch
COPY --from=rootfs-stage /root-out/ / 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 build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL MAINTAINER="sparkyballs,TheLamer" LABEL MAINTAINER="sparkyballs,TheLamer"
...@@ -101,6 +99,11 @@ RUN \ ...@@ -101,6 +99,11 @@ RUN \
/app \ /app \
/config \ /config \
/defaults && \ /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 ****" && \ echo "**** cleanup ****" && \
apt-get clean && \ apt-get clean && \
rm -rf \ rm -rf \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment