Merge pull request #113 from BIBOLV/master

Docker fix
pull/114/head
Fredrik Öhrström 2020-05-11 11:00:40 +02:00 zatwierdzone przez GitHub
commit d566aeaeb8
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 6 dodań i 9 usunięć

Wyświetl plik

@ -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

Wyświetl plik

@ -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

Wyświetl plik

@ -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