Use relative paths for dockerfile and context, for docker/compose-cli…

…#1854 (#3078)
ddev · Jun 30, 2021 · d2f2019 · d2f2019
1 parent 53dc266
commit d2f2019
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkg/ddevapp/config.go b/pkg/ddevapp/config.go
@@ -729,10 +729,10 @@ func (app *DdevApp) RenderComposeYAML() (string, error) {
 		Username:                  username,
 		UID:                       uid,
 		GID:                       gid,
-		WebBuildContext:           app.GetConfigPath("web-build"),
-		DBBuildContext:            app.GetConfigPath("db-build"),
-		WebBuildDockerfile:        app.GetConfigPath(".webimageBuild/Dockerfile"),
-		DBBuildDockerfile:         app.GetConfigPath(".dbimageBuild/Dockerfile"),
+		WebBuildContext:           "./web-build",
+		DBBuildContext:            "./db-build",
+		WebBuildDockerfile:        "../.webimageBuild/Dockerfile",
+		DBBuildDockerfile:         "../.dbimageBuild/Dockerfile",
 		AutoRestartContainers:     globalconfig.DdevGlobalConfig.AutoRestartContainers,
 		FailOnHookFail:            app.FailOnHookFail || app.FailOnHookFailGlobal,
 		WebEnvironment:            webEnvironment,
@@ -779,7 +779,7 @@ func (app *DdevApp) RenderComposeYAML() (string, error) {
 	}
 
 	// SSH agent just needs extra to add the official related user, nothing else
-	err = WriteBuildDockerfile(app.GetConfigPath(".sshimageBuild/Dockerfile"), "", nil, "")
+	err = WriteBuildDockerfile(filepath.Join(globalconfig.GetGlobalDdevDir(), ".sshimageBuild/Dockerfile"), "", nil, "")
 	if err != nil {
 		return "", err
 	}

diff --git a/pkg/ddevapp/ssh_auth.go b/pkg/ddevapp/ssh_auth.go
@@ -100,8 +100,8 @@ func (app *DdevApp) CreateSSHAuthComposeFile() (string, error) {
 		return "", err
 	}
 
-	context := filepath.Join(globalconfig.GetGlobalDdevDir(), ".sshimageBuild")
-	err = WriteBuildDockerfile(filepath.Join(context, "Dockerfile"), "", nil, "")
+	context := "./.sshimageBuild"
+	err = WriteBuildDockerfile(filepath.Join(globalconfig.GetGlobalDdevDir(), context, "Dockerfile"), "", nil, "")
 	if err != nil {
 		return "", err
 	}