wip

Jasper-Ben · Aug 19, 2024 · 15491eb · 15491eb
1 parent 80d4956
commit 15491eb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/release-container.yml b/.github/workflows/release-container.yml
@@ -41,7 +41,7 @@ jobs:
         env:
           KO_DOCKER_REPO: ghcr.io/${{ steps.lowercase-repository-name.outputs.lowercase }}
           SOURCE_TAG: ${{ steps.tag_name.outputs.SOURCE_TAG }}
-          GOFLAGS: "-ldflags=\"-X=github.com/google/go-containerregistry/cmd/crane/cmd.Version=${{ steps.tag_name.outputs.SOURCE_TAG }} '-X=github.com/google/go-containerregistry/pkg/v1/remote/transport.Version={{.Version}}'\""
+          KO_CONFIG_PATH: ${{ github.workspace }}/.ko/default/.ko.yaml
       - name: Build the crane-ish builder debug images
         run: |
           ko build -B github.com/google/go-containerregistry/cmd/crane  -t "debug"
@@ -51,7 +51,6 @@ jobs:
           ko build -B github.com/google/go-containerregistry/cmd/krane -t "debug"
         env:
           KO_CONFIG_PATH: ${{ github.workspace }}/.ko/debug/.ko.yaml
-          GOFLAGS: "-ldflags=\"-X=github.com/google/go-containerregistry/cmd/crane/cmd.Version=${{ steps.tag_name.outputs.SOURCE_TAG }} '-X=github.com/google/go-containerregistry/pkg/v1/remote/transport.Version={{.Version}}'\""
       - name: Build the tag specific debug images
         run: |
           KO_DOCKER_REPO=ghcr.io/${{ steps.lowercase-repository-name.outputs.lowercase }}/crane/debug  ko build --bare github.com/google/go-containerregistry/cmd/crane  -t latest -t $GITHUB_SHA -t $SOURCE_TAG
@@ -62,4 +61,3 @@ jobs:
         env:
           KO_CONFIG_PATH: ${{ github.workspace }}/.ko/debug/.ko.yaml
           SOURCE_TAG: ${{ steps.tag_name.outputs.SOURCE_TAG }}
-          GOFLAGS: "-ldflags=\"-X=github.com/google/go-containerregistry/cmd/crane/cmd.Version=${{ steps.tag_name.outputs.SOURCE_TAG }} '-X=github.com/google/go-containerregistry/pkg/v1/remote/transport.Version={{.Version}}'\""
diff --git a/.ko/debug/.ko.yaml b/.ko/debug/.ko.yaml
@@ -1 +1,6 @@
 defaultBaseImage: gcr.io/distroless/base:debug
+defaultFlags:
+  - -trimpath
+defaultLdflags:
+  - -X github.com/google/go-containerregistry/cmd/crane/cmd.Version={{.Git.Tag}}
+  - -X github.com/google/go-containerregistry/pkg/v1/remote/transport.Version={{.Git.Tag}}
diff --git a/.ko/default/.ko.yaml b/.ko/default/.ko.yaml
@@ -0,0 +1,5 @@
+defaultFlags:
+  - -trimpath
+defaultLdflags:
+  - -X github.com/google/go-containerregistry/cmd/crane/cmd.Version={{.Git.Tag}}
+  - -X github.com/google/go-containerregistry/pkg/v1/remote/transport.Version={{.Git.Tag}}