test docker build

testuser7 · Feb 4, 2024 · 8a4af1c · 8a4af1c
1 parent 8eb08e3
commit 8a4af1c
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 29 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,18 @@ name: Build docker
 on:
   push:
     branches:
-      - 'master'
-    tags:
-      - '[0-9]+\.[0-9]+\.[0-9]+'
-      - '[0-9]+\.[0-9]+\.[0-9]+-RC[0-9]+'
+      - 'dev'
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  docker:
+  build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     strategy:
       fail-fast: false
       matrix:
@@ -19,6 +23,11 @@ jobs:
           - linux/arm/v7
           - linux/arm64
     steps:
+      -
+        name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       -
         name: Checkout
         uses: actions/checkout@v4
@@ -27,41 +36,78 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: wmbusmeters/wmbusmeters
-          tags: type=ref,event=tag
+          images: ${{ env.IMAGE_NAME }}
       -
         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 }}
         uses: docker/build-push-action@v5
         with:
           context: docker/
           platforms: ${{ matrix.platform }}
-          push: true
-          tags: wmbusmeters/wmbusmeters:latest
+          labels: ${{ steps.meta.outputs.labels }}
+          outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true,provenance=false
       -
-        name: Build and push candidate
-        if: ${{ steps.meta.outputs.tags && contains(steps.meta.outputs.tags, '-RC') }}
-        uses: docker/build-push-action@v5
+        name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"          
+      -
+        name: Upload digest
+        uses: actions/upload-artifact@v4
         with:
-          context: docker/
-          platforms: ${{ matrix.platform }}
-          push: true
-          tags: wmbusmeters/wmbusmeters:candidate-${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+          name: digests-${{ env.PLATFORM_PAIR }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs:
+      - build
+    steps:
       -
-        name: Build and push tagged release
-        if: ${{ steps.meta.outputs.tags && !contains(steps.meta.outputs.tags, '-RC') }}
-        uses: docker/build-push-action@v5
+        name: Download digests
+        uses: actions/download-artifact@v4
         with:
-          context: docker/
-          platforms: ${{ matrix.platform }}
-          push: true
-          tags: wmbusmeters/wmbusmeters:release-${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+          path: /tmp/digests
+          pattern: digests-*
+          merge-multiple: true
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_NAME }}
+      - 
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.IMAGE_NAME }}@sha256:%s ' *)          
+      -
+        name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.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