1 files changed, 12 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go
index 1d0b4c45d..0579da8de 100644
--- a/pkg/api/handlers/compat/containers_create.go
+++ b/pkg/api/handlers/compat/containers_create.go
@@ -82,7 +82,13 @@ func makeCreateConfig(ctx context.Context, containerConfig *config.Config, input
 		}
 	}
 
-	workDir := "/"
+	workDir, err := newImage.WorkingDir(ctx)
+	if err != nil {
+		return createconfig.CreateConfig{}, err
+	}
+	if workDir == "" {
+		workDir = "/"
+	}
 	if len(input.WorkingDir) > 0 {
 		workDir = input.WorkingDir
 	}
@@ -169,6 +175,11 @@ func makeCreateConfig(ctx context.Context, containerConfig *config.Config, input
 	// away incorrectly formatted variables so we cannot reuse the
 	// parsing of the env input
 	// [Foo Other=one Blank=]
+	imgEnv, err := newImage.Env(ctx)
+	if err != nil {
+		return createconfig.CreateConfig{}, err
+	}
+	input.Env = append(imgEnv, input.Env...)
 	for _, e := range input.Env {
 		splitEnv := strings.Split(e, "=")
 		switch len(splitEnv) {