From 01f0d0891606dd36ed7bcaa2b30fbd1d3f44ff6a Mon Sep 17 00:00:00 2001 From: BIBOLV <49994376+BIBOLV@users.noreply.github.com> Date: Sun, 10 May 2020 22:35:37 +0300 Subject: [PATCH] Docker fix Changes in alpine packages --- docker/Dockerfile | 5 ++--- docker/Dockerfile.arm64v8 | 5 ++--- docker/Dockerfile.armhf | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7dbf39b..e4a181e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ FROM multiarch/alpine:amd64-latest-stable AS build -RUN apk add --no-cache alpine-sdk gcc +RUN apk add --no-cache alpine-sdk gcc linux-headers RUN git clone https://github.com/weetmuts/wmbusmeters.git && \ git clone https://github.com/xaelsouth/rtl-wmbus.git WORKDIR /wmbusmeters @@ -9,8 +9,7 @@ RUN make release && chmod 755 build/rtl_wmbus FROM multiarch/alpine:amd64-latest-stable as scratch ENV QEMU_EXECVE=1 -RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb && \ - apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing rtl-sdr +RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr WORKDIR /wmbusmeters COPY --from=build /wmbusmeters/build/wmbusmeters /wmbusmeters/wmbusmeters COPY --from=build /rtl-wmbus/build/rtl_wmbus /usr/bin/rtl_wmbus diff --git a/docker/Dockerfile.arm64v8 b/docker/Dockerfile.arm64v8 index 9ccf347..a71ac59 100644 --- a/docker/Dockerfile.arm64v8 +++ b/docker/Dockerfile.arm64v8 @@ -1,5 +1,5 @@ FROM multiarch/alpine:arm64-latest-stable AS build -RUN apk add --no-cache alpine-sdk gcc +RUN apk add --no-cache alpine-sdk gcc linux-headers RUN git clone https://github.com/weetmuts/wmbusmeters.git && \ git clone https://github.com/xaelsouth/rtl-wmbus.git WORKDIR /wmbusmeters @@ -9,8 +9,7 @@ RUN make release && chmod 755 build/rtl_wmbus FROM multiarch/alpine:arm64-latest-stable as scratch ENV QEMU_EXECVE=1 -RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb && \ - apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing rtl-sdr +RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr WORKDIR /wmbusmeters COPY --from=build /wmbusmeters/build/wmbusmeters /wmbusmeters/wmbusmeters COPY --from=build /rtl-wmbus/build/rtl_wmbus /usr/bin/rtl_wmbus diff --git a/docker/Dockerfile.armhf b/docker/Dockerfile.armhf index 5905855..98cdef2 100644 --- a/docker/Dockerfile.armhf +++ b/docker/Dockerfile.armhf @@ -1,5 +1,5 @@ FROM multiarch/alpine:armhf-latest-stable AS build -RUN apk add --no-cache alpine-sdk gcc +RUN apk add --no-cache alpine-sdk gcc linux-headers RUN git clone https://github.com/weetmuts/wmbusmeters.git && \ git clone https://github.com/xaelsouth/rtl-wmbus.git WORKDIR /wmbusmeters @@ -9,8 +9,7 @@ RUN make release && chmod 755 build/rtl_wmbus FROM multiarch/alpine:armhf-latest-stable as scratch ENV QEMU_EXECVE=1 -RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb && \ - apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing rtl-sdr +RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr WORKDIR /wmbusmeters COPY --from=build /wmbusmeters/build/wmbusmeters /wmbusmeters/wmbusmeters COPY --from=build /rtl-wmbus/build/rtl_wmbus /usr/bin/rtl_wmbus