From dd680806cdc7fb337a563a2e6007c08f88b994dd Mon Sep 17 00:00:00 2001
From: Wentao Kuang <wkuang@linz.govt.nz>
Date: Mon, 30 Sep 2024 13:58:37 +1300
Subject: [PATCH] use oci output

---
 .github/workflows/containers.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index a2923b852..08d6c4558 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -62,10 +62,9 @@ jobs:
           context: packages/cli
           platforms: linux/arm64,linux/amd64
           tags: |
-            cli
             ghcr.io/linz/basemaps/cli:latest
             ghcr.io/linz/basemaps/cli:${{ steps.version.outputs.version }}
-          outputs: type=docker,dest=/tmp/cli.tar
+          outputs: type=oci,dest=/tmp/cli.tar
           push: ${{github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, 'release:') == false}}
 
       - name: '@basemaps/cli - Build and push Major/Minor'
@@ -75,12 +74,11 @@ jobs:
           platforms: linux/arm64,linux/amd64
           # Publish :v6 and :v6.38 tags when publishing a release
           tags: |
-            cli
             ghcr.io/linz/basemaps/cli:latest
             ghcr.io/linz/basemaps/cli:${{ steps.version.outputs.version_major }}
             ghcr.io/linz/basemaps/cli:${{ steps.version.outputs.version_major_minor }}
             ghcr.io/linz/basemaps/cli:${{ steps.version.outputs.version }}
-          outputs: type=docker,dest=/tmp/cli.tar
+          outputs: type=oci,dest=/tmp/cli.tar
           push: ${{github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, 'release:')}}
 
       - name: '@basemaps/server - Build and push'
@@ -89,10 +87,9 @@ jobs:
           context: packages/server
           platforms: linux/arm64,linux/amd64
           tags: |
-            server
             ghcr.io/linz/basemaps/server:latest
             ghcr.io/linz/basemaps/server:${{ steps.version.outputs.version }}
-          outputs: type=docker,dest=/tmp/server.tar
+          outputs: type=oci,dest=/tmp/server.tar
           push: ${{github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, 'release:') == false}}
 
       - name: '@basemaps/server - Build and push Major/Minor'
@@ -102,12 +99,11 @@ jobs:
           platforms: linux/arm64,linux/amd64
           # Publish :v6 and :v6.38 tags when publishing a release
           tags: |
-            server
             ghcr.io/linz/basemaps/server:latest
             ghcr.io/linz/basemaps/server:${{ steps.version.outputs.version_major }}
             ghcr.io/linz/basemaps/server:${{ steps.version.outputs.version_major_minor }}
             ghcr.io/linz/basemaps/server:${{ steps.version.outputs.version }}
-          outputs: type=docker,dest=/tmp/server.tar
+          outputs: type=oci,dest=/tmp/server.tar
           push: ${{github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, 'release:')}}
 
       - name: 'Validate Containers build'