From aab9b11e8370f8822e5476f6209c18ea97505b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= Date: Mon, 11 May 2020 12:14:28 +0200 Subject: [PATCH] Add ncurses to docker build and image. --- README.md | 3 +++ docker/Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 665a03d..16f6cc4 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,9 @@ The program runs on GNU/Linux, MacOSX, FreeBSD, and Raspberry Pi. | ------------ |:-------------:| |GNU/Linux & MacOSX| [![Build Status](https://travis-ci.org/weetmuts/wmbusmeters.svg?branch=master)](https://travis-ci.org/weetmuts/wmbusmeters) | +|arm versions|[![CircleCI>](https://circleci.com/gh/weetmuts/wmbusmeters.svg?style=svg)](https://circleci.com/gh/weetmuts/workflows/wmbusmeters)| + + | Static Scan | Status | | ------------- |:-------------:| |Linux G++| [![Build Status](https://scan.coverity.com/projects/14774/badge.svg)](https://scan.coverity.com/projects/weetmuts-wmbusmeters) | diff --git a/docker/Dockerfile b/docker/Dockerfile index e4a181e..5bcc7b9 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 linux-headers +RUN apk add --no-cache alpine-sdk gcc linux-headers ncurses-dev RUN git clone https://github.com/weetmuts/wmbusmeters.git && \ git clone https://github.com/xaelsouth/rtl-wmbus.git WORKDIR /wmbusmeters @@ -9,7 +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 rtl-sdr +RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr ncurses WORKDIR /wmbusmeters COPY --from=build /wmbusmeters/build/wmbusmeters /wmbusmeters/wmbusmeters COPY --from=build /rtl-wmbus/build/rtl_wmbus /usr/bin/rtl_wmbus