opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-02 06:37:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[apiv2] don't ignore the ENV and WorkDir from the image
This commit is contained in:
OpenShift Merge Robot
2020-10-01 10:00:15 -04:00
committed by GitHub
parent 556117c2e9 cde367c1c0
commit 3948cb76e2
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 {
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) {