holm/homer
1
0
Fork 0
forked from extern/homer
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56 from nightah/fix-docker-multiarch-builds

Browse Source 
Fix docker multiarch builds
This commit is contained in:
Bastien Wirtz 2020-05-19 22:39:14 -07:00 committed by GitHub
commit cf2df79869
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile.arm32v7
View File

@ -1,12 +1,13 @@
FROM alpine AS builder
FROM alpine as qemu
# Download QEMU, see https://github.com/docker/hub-feedback/issues/1261
ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-aarch64.tar.gz
RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1
ARG QEMU_VERSION "v4.2.0-7"
RUN wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-arm-static && chmod +x qemu-arm-static
FROM arm32v7/alpine:3.11
COPY --from=builder qemu-aarch64-static /usr/bin
COPY --from=qemu qemu-arm-static /usr/bin/
COPY ./ /www/
ENV USER darkhttpd
@ -15,7 +16,8 @@ ENV GID 911
ENV UID 911
RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
apk add -U darkhttpd
apk add -U darkhttpd && \
rm /usr/bin/qemu-arm-static
USER darkhttpd

12
Dockerfile.arm64v8
View File

@ -1,12 +1,13 @@
FROM alpine AS builder
FROM alpine as qemu
# Download QEMU, see https://github.com/docker/hub-feedback/issues/1261
ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-aarch64.tar.gz
RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1
ARG QEMU_VERSION "v4.2.0-7"
RUN wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-aarch64-static && chmod +x qemu-aarch64-static
FROM arm64v8/alpine:3.11
COPY qemu-arm-static /usr/bin
COPY --from=qemu qemu-aarch64-static /usr/bin/
COPY ./ /www/
ENV USER darkhttpd
@ -15,7 +16,8 @@ ENV GID 911
ENV UID 911
RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
apk add -U darkhttpd
apk add -U darkhttpd && \
rm /usr/bin/qemu-aarch64-static
USER darkhttpd