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 · May 8, 2023 · 76d986f · 76d986f
1 parent 8a8b600
commit 76d986f
Show file tree

Hide file tree

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

diff --git a/cli/compose/interpolation/interpolation_test.go b/cli/compose/interpolation/interpolation_test.go
@@ -11,6 +11,7 @@ import (
 var defaults = map[string]string{
 	"USER":  "jenny",
 	"FOO":   "bar",
+	"CMD":   "my-cmd",
 	"count": "5",
 }
 
@@ -22,7 +23,11 @@ func defaultMapping(name string) (string, bool) {
 func TestInterpolate(t *testing.T) {
 	services := map[string]interface{}{
 		"servicea": map[string]interface{}{
-			"image":   "example:${USER}",
+			"image": "example:${USER}",
+			"command": []interface{}{
+				"${CMD:-${UNDEF_CMD:-}}",
+				"${UNDEF:-${CMD}}",
+			},
 			"volumes": []interface{}{"$FOO:/target"},
 			"logging": map[string]interface{}{
 				"driver": "${FOO}",
@@ -36,6 +41,7 @@ func TestInterpolate(t *testing.T) {
 		"servicea": map[string]interface{}{
 			"image":   "example:jenny",
 			"volumes": []interface{}{"bar:/target"},
+			"command": []interface{}{"my-cmd", "my-cmd"},
 			"logging": map[string]interface{}{
 				"driver": "bar",
 				"options": map[string]interface{}{

diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/compose-spec/compose-go/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