workout

Author: g-bgg

.github/workflows/release.yaml

@@ -10,7 +10,7 @@ permissions:
   contents: write
 
 env:
-  REGISTRY: ghcr.io
+  GH_REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
   RELEASE_VERSION: ${{ github.ref_name }}
 
@@ -43,17 +43,17 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
-      - name: Log in to the Container registry
+      - name: Log in to the GitHub Container registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GH_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.GH_REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -69,10 +69,27 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             VERSION=${{ env.RELEASE_VERSION }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            controlplane/netassert:${{ github.ref_name }}
+            controlplane/netassert:latest
+          build-args: |
+            VERSION=${{ env.RELEASE_VERSION }}
+
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v3
         with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
+          subject-name: ${{ env.GH_REGISTRY }}/${{ env.IMAGE_NAME}}
           subject-digest: ${{ steps.push.outputs.digest }}
           push-to-registry: true
 
@@ -85,8 +102,8 @@ jobs:
         run: |
           CLEAN_VERSION=$(echo "$RELEASE_VERSION" | sed 's/^v//')
           echo "Using chart version and appVersion: $CLEAN_VERSION"
-          sed -i "s/^version:$/version: ${CLEAN_VERSION}/" ./helm/Chart.yaml
-          sed -i "s/^appVersion:$/appVersion: ${CLEAN_VERSION}/" ./helm/Chart.yaml
+          sed -i "s/^version:.*/version: ${CLEAN_VERSION}/" ./helm/Chart.yaml
+          sed -i "s/^appVersion:.*/appVersion: ${CLEAN_VERSION}/" ./helm/Chart.yaml
           helm package ./helm -d .
       - name: Push Helm chart to GHCR
         run: |

cmd/netassert/cli/run.go

@@ -35,9 +35,9 @@ type runCmdConfig struct {
 var runCmdCfg = runCmdConfig{
 	TapFile:                "results.tap", // name of the default TAP file where the results will be written
 	SuffixLength:           9,             // suffix length of the random string to be appended to the container name
-	SnifferContainerImage:  "docker.io/controlplane/netassertv2-packet-sniffer:latest",
+	SnifferContainerImage:  "docker.io/controlplane/netassertv2-packet-sniffer:v1.1.7",
 	SnifferContainerPrefix: "netassertv2-sniffer",
-	ScannerContainerImage:  "docker.io/controlplane/netassertv2-l4-client:latest",
+	ScannerContainerImage:  "docker.io/controlplane/netassertv2-l4-client:v1.0.6",
 	ScannerContainerPrefix: "netassertv2-client",
 	PauseInSeconds:         1,      // seconds to pause before each test case
 	PacketCaptureInterface: `eth0`, // the interface used by the sniffer image to capture traffic

helm/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-description: NetAssert.
+description: NetAssert
 name: netassert
-version:
-appVersion:
+version: 1.0.0-dev
+appVersion: 1.0.0-dev
 home: https://github.com/controlplaneio/netassert
 sources:
 - https://github.com/controlplaneio/netassert