oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-06 17:40:58 +00:00
Code Wiki Activity

Add reading environment from Docker image (#771)

Browse source 
* fix: read envvars from image definition

* fix: add test

* fix: sort slices

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
Ryan 2021-09-26 16:37:53 +00:00 • committed by GitHub
parent 1af7304b2c
commit 26ae039f33
2 changed files with 75 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

42
act/container/docker_run.go
View file

@ -294,8 +294,15 @@ func (cr *containerReference) create(capAdd []string, capDrop []string) common.E
}
logger := common.Logger(ctx)
isTerminal := term.IsTerminal(int(os.Stdout.Fd()))
input := cr.input
insp, _, err := cr.cli.ImageInspectWithRaw(ctx, input.Image)
if err != nil {
logger.Error(err)
}
input.Env = mergeEnvFromImage(input.Env, insp.Config.Env)
config := &container.Config{
Image: input.Image,
Cmd: input.Cmd,
@ -348,6 +355,39 @@ func (cr *containerReference) create(capAdd []string, capDrop []string) common.E
}
}
func mergeEnvFromImage(inputEnv, imageEnv []string) []string {
envMap := make(map[string]string)
for _, v := range inputEnv {
e := strings.Split(v, `=`)
if e[1] == "" {
envMap[e[0]] = ""
} else {
envMap[e[0]] = e[1]
}
}
for _, v := range imageEnv {
e := strings.SplitN(v, `=`, 2)
if env, ok := envMap[e[0]]; !ok {
if e[1] != "" {
envMap[e[0]] = e[1]
}
} else {
if e[0] == "PATH" {
if e[1] != "" {
envMap[e[0]] = strings.Join([]string{env, e[1]}, `:`)
}
}
}
}
out := make([]string, 0)
for k, v := range envMap {
out = append(out, strings.Join([]string{k, v}, `=`))
}
return out
}
var singleLineEnvPattern, mulitiLineEnvPattern *regexp.Regexp
func (cr *containerReference) extractEnv(srcPath string, env *map[string]string) common.Executor {