kopia lustrzana https://github.com/weetmuts/wmbusmeters
Docker fix
Fix tags for armhf docker image reported in https://github.com/weetmuts/wmbusmeters/issues/762pull/804/head
rodzic
c54c5b3fe5
commit
abcecb73e2
|
@ -40,7 +40,7 @@ jobs:
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: docker/
|
context: docker/
|
||||||
platforms: linux/amd64,linux/arm64,linux/armv7
|
platforms: linux/amd64,linux/arm64,linux/armhf
|
||||||
push: true
|
push: true
|
||||||
tags: weetmuts/wmbusmeters:latest
|
tags: weetmuts/wmbusmeters:latest
|
||||||
-
|
-
|
||||||
|
@ -49,7 +49,7 @@ jobs:
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: docker/
|
context: docker/
|
||||||
platforms: linux/amd64,linux/arm64,linux/armv7
|
platforms: linux/amd64,linux/arm64,linux/armhf
|
||||||
push: true
|
push: true
|
||||||
tags: weetmuts/wmbusmeters:candidate-${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
|
tags: weetmuts/wmbusmeters:candidate-${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
|
||||||
-
|
-
|
||||||
|
@ -58,6 +58,6 @@ jobs:
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: docker/
|
context: docker/
|
||||||
platforms: linux/amd64,linux/arm64,linux/armv7
|
platforms: linux/amd64,linux/arm64,linux/armhf
|
||||||
push: true
|
push: true
|
||||||
tags: weetmuts/wmbusmeters:release-${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
|
tags: weetmuts/wmbusmeters:release-${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
|
|
@ -1,4 +1,4 @@
|
||||||
FROM multiarch/alpine:${TARGETARCH}-latest-stable AS build
|
FROM multiarch/alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable AS build
|
||||||
RUN apk add --no-cache alpine-sdk gcc linux-headers ncurses-dev librtlsdr-dev cmake libusb-dev bash
|
RUN apk add --no-cache alpine-sdk gcc linux-headers ncurses-dev librtlsdr-dev cmake libusb-dev bash
|
||||||
RUN git clone https://github.com/weetmuts/wmbusmeters.git && \
|
RUN git clone https://github.com/weetmuts/wmbusmeters.git && \
|
||||||
git clone https://github.com/weetmuts/rtl-wmbus.git && \
|
git clone https://github.com/weetmuts/rtl-wmbus.git && \
|
||||||
|
@ -10,7 +10,7 @@ RUN make release && chmod 755 build/rtl_wmbus
|
||||||
WORKDIR /rtl_433
|
WORKDIR /rtl_433
|
||||||
RUN mkdir build && cd build && cmake ../ && make
|
RUN mkdir build && cd build && cmake ../ && make
|
||||||
|
|
||||||
FROM multiarch/alpine:${TARGETARCH}-latest-stable as scratch
|
FROM multiarch/alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable as scratch
|
||||||
ENV QEMU_EXECVE=1
|
ENV QEMU_EXECVE=1
|
||||||
RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb ncurses rtl-sdr netcat-openbsd
|
RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb ncurses rtl-sdr netcat-openbsd
|
||||||
WORKDIR /wmbusmeters
|
WORKDIR /wmbusmeters
|
||||||
|
|
Ładowanie…
Reference in New Issue