medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://github.com/OliveTin/OliveTin

This commit is contained in:
jamesread 2024-07-13 20:43:21 +01:00
parent 510c48e1af 3ac809c234
commit 3ca3a2dd3c
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:38-x86_64 FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:40-x86_64
LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
LABEL org.opencontainers.image.title=OliveTin LABEL org.opencontainers.image.title=OliveTin

2
Dockerfile.arm64
View File

@ -1,4 +1,4 @@
FROM --platform=linux/arm64 registry.fedoraproject.org/fedora-minimal:38-aarch64 FROM --platform=linux/arm64 registry.fedoraproject.org/fedora-minimal:40-aarch64
LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
LABEL org.opencontainers.image.title=OliveTin LABEL org.opencontainers.image.title=OliveTin

9
internal/executor/executor.go
View File

@ -380,7 +380,14 @@ func buildEnv(req *ExecutionRequest) []string {
ret := append(os.Environ(), "OLIVETIN=1") ret := append(os.Environ(), "OLIVETIN=1")
for k, v := range req.Arguments { for k, v := range req.Arguments {
ret = append(ret, fmt.Sprintf("%v=%v", strings.ToUpper(k), v)) varName := fmt.Sprintf("%v", strings.TrimSpace(strings.ToUpper(k)))
// Skip arguments that might not have a name (eg, confirmation), as this causes weird bugs on Windows.
if varName == "" {
continue
}
ret = append(ret, fmt.Sprintf("%v=%v", varName, v))
} }
return ret return ret