move auto-version-annotation to config

dskiff · Apr 28, 2024 · 22f2154 · 22f2154
1 parent bd3bb46
commit 22f2154
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,8 +31,6 @@ jobs:
       - name: Run against local docker daemon
         run: |
           go run . build \
-            --annotations "org.opencontainers.image.revision=${{ github.sha }}" \
-            --annotations "org.opencontainers.image.version=dev-${{ github.sha }}" \
             --target-repo "test/repo" \
             "./dist/tko_linux_amd64_v1"
         env:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -36,7 +36,6 @@ jobs:
           tko build \
             --target-repo "ghcr.io/dskiff/tko:latest" \
             --entrypoint  "/bin/bash" \
-            --auto-version-annotation=git \
             "./dist/tko_linux_amd64_v1"
         env:
           GITHUB_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,7 +37,6 @@ jobs:
       - name: Publish (bin)
         run: |
           tko build \
-            --auto-version-annotation=git \
             --base-ref "scratch" \
             --target-repo "ghcr.io/dskiff/tko:bin" \
             "./dist/tko_linux_amd64_v1"
@@ -47,7 +46,6 @@ jobs:
       - name: Publish (version)
         run: |
           tko build \
-            --auto-version-annotation=git \
             --target-repo "ghcr.io/dskiff/tko:${{ github.ref_name }}" \
             --entrypoint  "/bin/bash" \
             "./dist/tko_linux_amd64_v1"

diff --git a/.tko.yml b/.tko.yml
@@ -2,6 +2,7 @@ build:
   base-ref: debian:bookworm-slim@sha256:155280b00ee0133250f7159b567a07d7cd03b1645714c3a7458b2287b0ca83cb
   destination-path: /usr/local/bin
   entrypoint: /usr/local/bin/tko
+  auto-version-annotation: git
   default-annotations:
     org.opencontainers.image.title: tko
     org.opencontainers.image.url: github.com/dskiff/tko