From 98609872534beeb5b5565a9186dc9f06dd96a687 Mon Sep 17 00:00:00 2001 From: sami Date: Sat, 30 Dec 2023 22:29:33 +0000 Subject: [PATCH 1/2] fix Dockerfile and add build process --- .github/workflows/docker-image.yaml | 22 ++++++++++++++++++++++ Dockerfile | 7 ++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/docker-image.yaml diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml new file mode 100644 index 0000000..8d6c43f --- /dev/null +++ b/.github/workflows/docker-image.yaml @@ -0,0 +1,22 @@ +name: Docker Image CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag fnzv/dump1090 + - name: Registry login + run: echo ${{secrets.GH_DOCKERHUB}} | docker login -u fnzv --password-stdin + - name: Push image + run: docker push fnzv/dump1090 diff --git a/Dockerfile b/Dockerfile index c9b43f1..97ae669 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:latest as builder +FROM ubuntu:22.04 as builder RUN apt update && \ apt install -y \ @@ -16,15 +16,16 @@ RUN apt update && \ RUN git clone https://github.com/flightaware/dump1090.git /dump1090 WORKDIR /dump1090 -RUN git checkout 849a3b73299b4f56620ab16a6b62d88e17f35608 +#RUN git checkout 849a3b73299b4f56620ab16a6b62d88e17f35608 RUN make -FROM debian:latest +From ubuntu:22.04 RUN apt update && \ apt install -y \ libbladerf2 \ libhackrf0 \ + #liblimesuite-dev \ liblimesuite20.10-1 \ libncurses6 \ librtlsdr0 \ From 55737e56e42422a95e4b81bc1b3dbab008162e34 Mon Sep 17 00:00:00 2001 From: Sami Date: Sat, 30 Dec 2023 23:30:50 +0100 Subject: [PATCH 2/2] Update docker-image.yaml --- .github/workflows/docker-image.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml index 8d6c43f..7f9a71b 100644 --- a/.github/workflows/docker-image.yaml +++ b/.github/workflows/docker-image.yaml @@ -2,9 +2,9 @@ name: Docker Image CI on: push: - branches: [ "main" ] + branches: [ "master" ] pull_request: - branches: [ "main" ] + branches: [ "master" ] jobs: