use compose-go to interpolate compose variables

This allows for nested variables interpolation. Fixes docker#4265 Signed-off-by: N. Le Roux <[email protected]>
gilbsgilbs · Jan 9, 2025 · 982d52c · 982d52c
1 parent ff4697d
commit 982d52c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 535 deletions.
diff --git a/cli/compose/interpolation/interpolation.go b/cli/compose/interpolation/interpolation.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/docker/cli/cli/compose/template"
+	"github.com/compose-spec/compose-go/v2/template"
 	"github.com/pkg/errors"
 )
 

diff --git a/cli/compose/interpolation/interpolation_test.go b/cli/compose/interpolation/interpolation_test.go
@@ -14,6 +14,7 @@ import (
 var defaults = map[string]string{
 	"USER":  "jenny",
 	"FOO":   "bar",
+	"CMD":   "my-cmd",
 	"count": "5",
 }
 
@@ -26,6 +27,10 @@ func TestInterpolate(t *testing.T) {
 	services := map[string]any{
 		"servicea": map[string]any{
 			"image":   "example:${USER}",
+			"command": []any{
+				"${CMD:-${UNDEF_CMD:-}}",
+				"${UNDEF:-${CMD}}",
+			},
 			"volumes": []any{"$FOO:/target"},
 			"logging": map[string]any{
 				"driver": "${FOO}",
@@ -38,6 +43,7 @@ func TestInterpolate(t *testing.T) {
 	expected := map[string]any{
 		"servicea": map[string]any{
 			"image":   "example:jenny",
+			"command": []any{"my-cmd", "my-cmd"},
 			"volumes": []any{"bar:/target"},
 			"logging": map[string]any{
 				"driver": "bar",

diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go
@@ -13,9 +13,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/compose-spec/compose-go/v2/template"
 	interp "github.com/docker/cli/cli/compose/interpolation"
 	"github.com/docker/cli/cli/compose/schema"
-	"github.com/docker/cli/cli/compose/template"
 	"github.com/docker/cli/cli/compose/types"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types/versions"

diff --git a/cli/compose/template/template.go b/cli/compose/template/template.go