Bake: sort ssh entries

Signed-off-by: Sumner Warren <sumner_warren@brown.edu>
docker · May 9, 2024 · 9fad805 · 9fad805
1 parent 225bbab
commit 9fad805
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bake/compose.go b/bake/compose.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"sort"
 	"strings"
 
 	"github.com/compose-spec/compose-go/v2/dotenv"
@@ -112,6 +113,7 @@ func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Conf
 				sshkey := composeToBuildkitSSH(bkey)
 				ssh = append(ssh, sshkey)
 			}
+			sort.Strings(ssh)
 
 			var secrets []string
 			for _, bs := range s.Build.Secrets {
@@ -332,6 +334,7 @@ func (t *Target) composeExtTarget(exts map[string]interface{}) error {
 	}
 	if len(xb.SSH) > 0 {
 		t.SSH = dedupSlice(append(t.SSH, xb.SSH...))
+		sort.Strings(t.SSH)
 	}
 	if len(xb.Platforms) > 0 {
 		t.Platforms = dedupSlice(append(t.Platforms, xb.Platforms...))

diff --git a/bake/compose_test.go b/bake/compose_test.go
@@ -33,8 +33,8 @@ services:
       cache_to:
         - type=local,dest=path/to/cache
       ssh:
-        - default
         - key=path/to/key
+        - default
       secrets:
         - token
         - aws
@@ -294,6 +294,7 @@ services:
           - ct-addon:foo
           - ct-addon:alp
         ssh:
+          - default
           - other=path/to/otherkey
         platforms:
           - linux/amd64
@@ -337,7 +338,7 @@ services:
 	require.Equal(t, []string{"linux/amd64", "linux/arm64"}, c.Targets[0].Platforms)
 	require.Equal(t, []string{"user/app:cache", "type=local,src=path/to/cache"}, c.Targets[0].CacheFrom)
 	require.Equal(t, []string{"user/app:cache", "type=local,dest=path/to/cache"}, c.Targets[0].CacheTo)
-	require.Equal(t, []string{"key=path/to/key", "other=path/to/otherkey"}, c.Targets[0].SSH)
+	require.Equal(t, []string{"default", "key=path/to/key", "other=path/to/otherkey"}, c.Targets[0].SSH)
 	require.Equal(t, newBool(true), c.Targets[0].Pull)
 	require.Equal(t, map[string]string{"alpine": "docker-image://alpine:3.13"}, c.Targets[0].Contexts)
 	require.Equal(t, []string{"ct-fake-aws:bar"}, c.Targets[1].Tags)