Merge pull request #34 from netfoundry/fiddle-actions

fix build cache tag

Author: qrkourier

.github/workflows/pr.yaml

@@ -1,4 +1,4 @@
-name: pr
+name: Pull Request - Regression Test
 on:
   pull_request:
     types: [opened, synchronize]
@@ -41,8 +41,8 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
-          cache-from: type=registry,ref=${{ env.IMAGE_REPO }}
-          cache-to: type=registry,ref=${{ env.IMAGE_REPO }}:build,mode=max
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           push: true
           tags: ${{ env.REGISTRY}}/${{ env.IMAGE_REPO }}:${{ github.run_id }}
 

.github/workflows/pre-release.yml

@@ -55,8 +55,8 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
-          cache-from: type=registry,ref=${{ env.IMAGE_REPO }}:build
-          cache-to: type=registry,ref=${{ env.IMAGE_REPO }}:build,mode=max
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           labels: ${{ steps.meta.outputs.labels }}
           tags: ${{ steps.meta.outputs.tags }}
           build-args: VERSION=${{ github.ref_name }}

.github/workflows/promote.yml

@@ -1,4 +1,4 @@
-name: release
+name: Promote Stable Release
 
 on:
   release:
@@ -10,7 +10,7 @@ env:
   IMAGE_REPO: ${{ vars.ZITI_AGENT_IMAGE_REPO || 'netfoundry/ziti-k8s-agent' }}
 
 jobs:
-  build_deploy:
+  promote:
     runs-on: ubuntu-latest
     steps:
       - name: Parse Release Version
@@ -50,11 +50,12 @@ jobs:
             type=raw,value=latest,enable=${{startsWith(github.ref_name, 'v')}}
 
             # set (e.g., "v1") major version tag on releases
-            type=match,pattern=v\d+\..*,group=1,enable=${{startsWith(github.ref_name, 'v')}}
+            type=match,pattern=(v\d+)\..*,group=1,enable=${{startsWith(github.ref_name, 'v')}}
 
       - name: Promote Container Image Tags
         shell: bash
         run: |
+          set -o xtrace
           # Convert comma-separated tags to array
           IFS=',' read -ra TAGS <<< "${{ steps.meta.outputs.tags }}"
           
@@ -65,6 +66,6 @@ jobs:
           for TAG in "${TAGS[@]}"; do
             echo "Creating tag for $TAG -> $VERSION"
             docker buildx imagetools create \
-              --tag ${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}:${TAG} \
+              --tag ${TAG} \
               ${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}:${VERSION}
           done

Dockerfile

@@ -4,9 +4,13 @@ WORKDIR /app
 
 # Version can be passed as --build-arg VERSION=$(git describe --tags --always)
 ARG VERSION=v0.0.0
-COPY . .
-RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
+
+RUN go env -w GOMODCACHE=/root/.cache/go-build
+COPY go.mod go.sum ./
+RUN --mount=type=cache,target=/root/.cache/go-build go mod download
+
+COPY ./ziti-agent/ ./ziti-agent/
+RUN --mount=type=cache,target=/root/.cache/go-build \
     go build -x -v -ldflags="-X 'github.com/netfoundry/ziti-k8s-agent/ziti-agent/cmd/common.Version=${VERSION}'" -o build/ ./...
 
 #