internal/task: fix Git authentication

Seems that the cookie file format is quite inflexible. Also install git so that we can, you know, run it. Change-Id: Iddf487701914b306a5c0fb30bdc66277395ecc0b Reviewed-on: https://go-review.googlesource.com/c/build/+/536718 LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Heschi Kreinick <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
golang · Oct 20, 2023 · 33a0c70 · 33a0c70
1 parent 4988086
commit 33a0c70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/relui/Dockerfile b/cmd/relui/Dockerfile
@@ -19,7 +19,7 @@ FROM debian:bookworm
 
 RUN apt-get update && apt-get install -y \
 	--no-install-recommends \
-	tini ca-certificates
+	tini ca-certificates git
 
 ARG PORT=8080
 ENV PORT=${PORT}

diff --git a/internal/task/git.go b/internal/task/git.go
@@ -61,7 +61,7 @@ func (g *Git) runGitStreamed(ctx context.Context, stdout, stderr io.Writer, dir
 			return err
 		}
 		// https://github.com/curl/curl/blob/master/docs/HTTP-COOKIES.md
-		cookieLine := fmt.Sprintf(".googlesource.com TRUE / TRUE %v o %v\n", tok.Expiry.Unix(), tok.AccessToken)
+		cookieLine := fmt.Sprintf(".googlesource.com\tTRUE\t/\tTRUE\t%v\to\t%v\n", tok.Expiry.Unix(), tok.AccessToken)
 		if err := os.WriteFile(g.cookieFile, []byte(cookieLine), 0o700); err != nil {
 			return fmt.Errorf("error writing git cookies: %v", err)
 		}