Merge pull request #195 from compose-spec/build-dockerfile-relativepath

Author: ndeloof

loader/normalize.go

@@ -41,6 +41,10 @@ func normalize(project *types.Project, resolvePaths bool) error {
 	}
 	project.ComposeFiles = absComposeFiles
 
+	if project.Networks == nil {
+		project.Networks = make(map[string]types.NetworkConfig)
+	}
+
 	// If not declared explicitly, Compose model involves an implicit "default" network
 	if _, ok := project.Networks["default"]; !ok {
 		project.Networks["default"] = types.NetworkConfig{}
@@ -74,7 +78,6 @@ func normalize(project *types.Project, resolvePaths bool) error {
 			if _, err := os.Stat(localContext); err == nil {
 				if resolvePaths {
 					s.Build.Context = localContext
-					s.Build.Dockerfile = absPath(localContext, s.Build.Dockerfile)
 				}
 			} else {
 				// might be a remote http/git context. Unfortunately supported "remote" syntax is highly ambiguous

loader/normalize_test.go

@@ -17,6 +17,7 @@
 package loader
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
@@ -87,6 +88,41 @@ networks:
 	assert.DeepEqual(t, expected, string(marshal))
 }
 
+func TestNormalizeResolvePathsBuildContextPaths(t *testing.T) {
+	wd, _ := os.Getwd()
+	project := types.Project{
+		Name:       "myProject",
+		WorkingDir: wd,
+		Services: []types.ServiceConfig{
+			{
+				Name: "foo",
+				Build: &types.BuildConfig{
+					Context:    "./testdata",
+					Dockerfile: "Dockerfile-sample",
+				},
+				Scale: 1,
+			},
+		},
+	}
+
+	expected := fmt.Sprintf(`services:
+  foo:
+    build:
+      context: %s
+      dockerfile: Dockerfile-sample
+    networks:
+      default: null
+networks:
+  default:
+    name: myProject_default
+`, filepath.Join(wd, "testdata"))
+	err := normalize(&project, true)
+	assert.NilError(t, err)
+	marshal, err := yaml.Marshal(project)
+	assert.NilError(t, err)
+	assert.DeepEqual(t, expected, string(marshal))
+}
+
 func TestNormalizeAbsolutePaths(t *testing.T) {
 	project := types.Project{
 		Name:         "myProject",