opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 17:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: The container created by APIV2 has an incorrect Env and WorkDir

Browse Source 
Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
This commit is contained in:
zhangguanzhang
2020-09-30 23:09:06 +08:00
parent 19f080f1af
commit cde367c1c0
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/api/handlers/compat/containers_create.go
View File

@ -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 { if len(input.WorkingDir) > 0 {
workDir = input.WorkingDir 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 // away incorrectly formatted variables so we cannot reuse the
// parsing of the env input // parsing of the env input
// [Foo Other=one Blank=] // [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 { for _, e := range input.Env {
splitEnv := strings.Split(e, "=") splitEnv := strings.Split(e, "=")
switch len(splitEnv) { switch len(splitEnv) {

23
test/apiv2/20-containers.at
View File

@ -3,8 +3,11 @@
# test container-related endpoints # 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 # Unimplemented
#t POST libpod/containers/create '' 201 'sdf' #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 204
t DELETE containers/$cid_top 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 # vim: filetype=sh