diff options
author | Bastien Wirtz <bastien.wirtz@gmail.com> | 2020-05-19 22:39:14 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-19 22:39:14 -0700 |
commit | cf2df79869b7376a6ffbce699755779ef7b9f137 (patch) | |
tree | 5d259b3cf88567fd308b9ccd87a8a83f73bb0edd /Dockerfile.arm32v7 | |
parent | 525120de61ec27c8d64207a703061c9400f77c07 (diff) | |
parent | 94f44a4fe822cb3c799fb34b880a9e462b5c9ed0 (diff) | |
download | homer-cf2df79869b7376a6ffbce699755779ef7b9f137.tar.gz homer-cf2df79869b7376a6ffbce699755779ef7b9f137.tar.zst homer-cf2df79869b7376a6ffbce699755779ef7b9f137.zip |
Merge pull request #56 from nightah/fix-docker-multiarch-builds
Fix docker multiarch builds
Diffstat (limited to 'Dockerfile.arm32v7')
-rw-r--r-- | Dockerfile.arm32v7 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index e78d37c..d78d608 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 | |||
@@ -1,12 +1,13 @@ | |||
1 | FROM alpine AS builder | 1 | FROM alpine as qemu |
2 | 2 | ||
3 | # Download QEMU, see https://github.com/docker/hub-feedback/issues/1261 | 3 | ARG QEMU_VERSION "v4.2.0-7" |
4 | ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-aarch64.tar.gz | 4 | |
5 | RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1 | 5 | RUN wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-arm-static && chmod +x qemu-arm-static |
6 | 6 | ||
7 | FROM arm32v7/alpine:3.11 | 7 | FROM arm32v7/alpine:3.11 |
8 | COPY --from=builder qemu-aarch64-static /usr/bin | 8 | COPY --from=builder qemu-aarch64-static /usr/bin |
9 | 9 | ||
10 | COPY --from=qemu qemu-arm-static /usr/bin/ | ||
10 | COPY ./ /www/ | 11 | COPY ./ /www/ |
11 | 12 | ||
12 | ENV USER darkhttpd | 13 | ENV USER darkhttpd |
@@ -15,7 +16,8 @@ ENV GID 911 | |||
15 | ENV UID 911 | 16 | ENV UID 911 |
16 | 17 | ||
17 | RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ | 18 | RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ |
18 | apk add -U darkhttpd | 19 | apk add -U darkhttpd && \ |
20 | rm /usr/bin/qemu-arm-static | ||
19 | 21 | ||
20 | USER darkhttpd | 22 | USER darkhttpd |
21 | 23 | ||