4
0
Эх сурвалжийг харах

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

jamesread 2 жил өмнө
parent
commit
3ca3a2dd3c

+ 1 - 1
Dockerfile

@@ -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.title=OliveTin

+ 1 - 1
Dockerfile.arm64

@@ -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.title=OliveTin

+ 8 - 1
internal/executor/executor.go

@@ -380,7 +380,14 @@ func buildEnv(req *ExecutionRequest) []string {
 	ret := append(os.Environ(), "OLIVETIN=1")
 
 	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