From 56ea89f79503b22505e38aa9ed01e90568667331 Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Wed, 27 Dec 2023 16:44:00 -0600
Subject: [PATCH] Use linux-* for public binary asset names (#3032)

I think we want to keep the `linux-` out of the Docker image names, but
it's help for the client binary to be named `linux-client`
---
 .github/workflows/cd.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 17e657bbf..82939ce7f 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -127,10 +127,13 @@ jobs:
         name:
           - package: firezone-linux-client
             artifact: linux-client
+            image_name: client
           - package: firezone-relay
             artifact: relay
+            image_name: relay
           - package: firezone-gateway
             artifact: gateway
+            image_name: gateway
     env:
       BINARY_DEST_PATH: ${{ matrix.name.artifact }}-${{ matrix.arch.shortname }}
     steps:
@@ -195,7 +198,7 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images:
-            ${{ steps.login.outputs.registry }}/firezone/${{matrix.name.artifact }}
+            ${{ steps.login.outputs.registry }}/firezone/${{matrix.name.image_name }}
           tags: |
             type=raw,value=${{ github.sha }}
             type=raw,value=${{ env.VERSION }}
@@ -211,17 +214,17 @@ jobs:
             TARGET=${{ matrix.arch.target }}
           context: rust
           cache-from: |
-            type=registry,ref=${{ steps.login.outputs.registry }}/cache/${{ matrix.name.artifact }}:main
+            type=registry,ref=${{ steps.login.outputs.registry }}/cache/${{ matrix.name.image_name }}:main
           cache-to: |
-            type=registry,ref=${{ steps.login.outputs.registry }}/cache/${{ matrix.name.artifact }}:main,mode=max
+            type=registry,ref=${{ steps.login.outputs.registry }}/cache/${{ matrix.name.image_name }}:main,mode=max
           target: release
           outputs:
-            type=image,name=${{ steps.login.outputs.registry }}/firezone/${{ matrix.name.artifact }},push-by-digest=true,name-canonical=true,push=true
+            type=image,name=${{ steps.login.outputs.registry }}/firezone/${{ matrix.name.image_name }},push-by-digest=true,name-canonical=true,push=true
       - name: Export digest
         run: |
-          mkdir -p /tmp/digests/${{ matrix.name.artifact }}
+          mkdir -p /tmp/digests/${{ matrix.name.image_name }}
           digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${{ matrix.name.artifact }}/${digest#sha256:}"
+          touch "/tmp/digests/${{ matrix.name.image_name }}/${digest#sha256:}"
       - name: Upload digest
         uses: actions/upload-artifact@v3
         with: