From 885f50839c02df2bf5ad673614bd427d3c1950f9 Mon Sep 17 00:00:00 2001 From: Koenkk Date: Sat, 16 Jun 2018 01:15:35 +0200 Subject: [PATCH] Docker build fix exec format error. --- docker/Dockerfile.arm32v6 | 6 ++---- docker/Dockerfile.arm64v8 | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile.arm32v6 b/docker/Dockerfile.arm32v6 index c8260dfd7..4ea5f4085 100644 --- a/docker/Dockerfile.arm32v6 +++ b/docker/Dockerfile.arm32v6 @@ -5,17 +5,15 @@ ENV QEMU_EXECVE 1 COPY docker/qemu-arm-static /usr/bin WORKDIR /app -# Write .hash.json -ARG COMMIT -RUN echo "{\"hash\": \"$COMMIT\"}" > .hash.json - # Copy files & install dependencies ADD . /app +ARG COMMIT RUN [ "qemu-arm-static", "/bin/sh", "-c", \ "cp /app/data/configuration.yaml /app && \ cp /app/docker/run.sh /app && chmod +x /app/run.sh && \ apk add --update --no-cache make gcc g++ python linux-headers udev nodejs git && \ npm install --unsafe-perm && \ + echo "{\"hash\": \"$COMMIT\"}" > .hash.json && \ apk del make gcc g++ python linux-headers udev git"] # Entrypoint diff --git a/docker/Dockerfile.arm64v8 b/docker/Dockerfile.arm64v8 index bd519d541..86390a85e 100644 --- a/docker/Dockerfile.arm64v8 +++ b/docker/Dockerfile.arm64v8 @@ -5,17 +5,15 @@ ENV QEMU_EXECVE 1 COPY docker/qemu-aarch64-static /usr/bin WORKDIR /app -# Write .hash.json -ARG COMMIT -RUN echo "{\"hash\": \"$COMMIT\"}" > .hash.json - # Copy files & install dependencies ADD . /app +ARG COMMIT RUN [ "qemu-aarch64-static", "/bin/sh", "-c", \ "cp /app/data/configuration.yaml /app && \ cp /app/docker/run.sh /app && chmod +x /app/run.sh && \ apk add --update --no-cache make gcc g++ python linux-headers udev nodejs git && \ npm install --unsafe-perm && \ + echo "{\"hash\": \"$COMMIT\"}" > .hash.json && \ apk del make gcc g++ python linux-headers udev git"] # Entrypoint