From d2f20192f3bcefcdae8fa854b6f8e9c98189022b Mon Sep 17 00:00:00 2001 From: Randy Fay Date: Wed, 30 Jun 2021 13:46:33 -0600 Subject: [PATCH] Use relative paths for dockerfile and context, for docker/compose-cli#1854 (#3078) --- pkg/ddevapp/config.go | 10 +++++----- pkg/ddevapp/ssh_auth.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/ddevapp/config.go b/pkg/ddevapp/config.go index 82e9db976a9..68e36a82fad 100644 --- 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 index 3403b41c830..b58bd3c8c0f 100644 --- 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 }