Merge pull request #7851 from zhangguanzhang/fix-apiv2-ctr-workdir-and-env

[apiv2] don't ignore the ENV and WorkDir from the image

2 files changed, 34 insertions, 2 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) {
diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
index 187073fb9..15b5dc4be 100644
--- a/test/apiv2/20-containers.at
+++ b/test/apiv2/20-containers.at
@@ -3,8 +3,11 @@
 # test container-related endpoints
 #
 
-podman pull $IMAGE &>/dev/null
+# WORKDIR=/data
+ENV_WORKDIR_IMG=docker.io/library/redis:alpine
 
+podman pull $IMAGE &>/dev/null
+podman pull $ENV_WORKDIR_IMG &>/dev/null
 # Unimplemented
 #t POST libpod/containers/create '' 201 'sdf'
 
@@ -203,4 +206,22 @@ t POST containers/${cid_top}/stop "" 204
 t DELETE containers/$cid 204
 t DELETE containers/$cid_top 204
 
+# test the apiv2 create, should't ignore the ENV and WORKDIR from the image
+t POST containers/create '"Image":"'$ENV_WORKDIR_IMG'","Env":["testKey1"]' 201 \
+  .Id~[0-9a-f]\\{64\\}
+cid=$(jq -r '.Id' <<<"$output")
+t GET containers/$cid/json 200 \
+  .Config.Env~"REDIS_VERSION=" \
+  .Config.Env~"testEnv1=" \
+  .Config.WorkingDir="/data" # default is /data
+t DELETE containers/$cid 204
+
+# test the WORKDIR
+t POST containers/create '"Image":"'$ENV_WORKDIR_IMG'","WorkingDir":"/dataDir"' 201 \
+  .Id~[0-9a-f]\\{64\\}
+cid=$(jq -r '.Id' <<<"$output")
+t GET containers/$cid/json 200 \
+  .Config.WorkingDir="/dataDir"
+t DELETE containers/$cid 204
+
 # vim: filetype=sh