test docker build

testuser7 · Feb 3, 2024 · 9fca7b1 · 9fca7b1
1 parent 6f3aee7
commit 9fca7b1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/.github/workflows/build_debian.yml b/.github/workflows/build_debian.yml
@@ -1,6 +1,8 @@
 name: Build Debian package
 on:
   push:
+    branches:
+      - master
   pull_request:
 
 jobs:

diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
@@ -3,14 +3,21 @@ name: Build docker
 on:
   push:
     branches:
-      - 'master'
+      - 'dev'
     tags:
       - '[0-9]+\.[0-9]+\.[0-9]+'
       - '[0-9]+\.[0-9]+\.[0-9]+-RC[0-9]+'
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   docker:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     strategy:
       fail-fast: false
       matrix:
@@ -27,17 +34,18 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: wmbusmeters/wmbusmeters
+          images: ${{ env.IMAGE_NAME }}
           tags: type=ref,event=tag
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Login to DockerHub
+      - 
+        name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PAT }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push not tagged release
         if: ${{ !steps.meta.outputs.tags }}
@@ -47,24 +55,24 @@ jobs:
           platforms: ${{ matrix.platform }}
           push: true
           provenance: false
-          tags: wmbusmeters/wmbusmeters:latest
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
       -
         name: Build and push candidate
         if: ${{ steps.meta.outputs.tags && contains(steps.meta.outputs.tags, '-RC') }}
         uses: docker/build-push-action@v5
         with:
           context: docker/
           platforms: ${{ matrix.platform }}
-          push: true
+          push: false
           provenance: false
-          tags: wmbusmeters/wmbusmeters:candidate-${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:candidate-${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
       -
         name: Build and push tagged release
         if: ${{ steps.meta.outputs.tags && !contains(steps.meta.outputs.tags, '-RC') }}
         uses: docker/build-push-action@v5
         with:
           context: docker/
           platforms: ${{ matrix.platform }}
-          push: true
+          push: false
           provenance: false
-          tags: wmbusmeters/wmbusmeters:release-${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:release-${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -1,6 +1,8 @@
 name: Build Ubuntu
 on:
   push:
+    branches:
+      - master
   pull_request:
 
 jobs:

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine AS build
 RUN apk add --no-cache alpine-sdk gcc linux-headers librtlsdr-dev libxml2-dev cmake libusb-dev bash
-RUN git clone https://github.com/wmbusmeters/wmbusmeters.git && \
+RUN git clone https://github.com/testuser7/wmbusmeters.git && \
     git clone https://github.com/weetmuts/rtl-wmbus.git && \
     git clone https://github.com/ED6E0F17/rtl_reset.git
 WORKDIR /wmbusmeters