Merge pull request #1971 from vdemeester/universe-go-fix

universe: go: add git by default in go.#Image
dagger · Apr 4, 2022 · d79de11 · d79de11
2 parents fa2ca10 + 2f2a4e0
commit d79de11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/universe.dagger.io/go/image.cue b/pkg/universe.dagger.io/go/image.cue
@@ -12,6 +12,8 @@ _#DefaultVersion: "1.18"
 	version: *_#DefaultVersion | string
 
 	packages: [pkgName=string]: version: string | *""
+	// FIXME Remove once golang image include 1.18 *or* go compiler is smart with -buildvcs
+	packages: git: _
 
 	// FIXME Basically a copy of alpine.#Build with a different image
 	// Should we create a special definition?

diff --git a/pkg/universe.dagger.io/go/test/image.cue b/pkg/universe.dagger.io/go/test/image.cue
@@ -18,7 +18,7 @@ dagger.#Plan & {
 				command: {
 					name: "/bin/sh"
 					args: ["-c", """
-							go version | grep "1.18"
+							go version | grep "1.18" ; git version
 						"""]
 				}
 			}
@@ -35,7 +35,7 @@ dagger.#Plan & {
 				command: {
 					name: "/bin/bash"
 					args: ["-c", """
-							go version | grep "1.17"
+							go version | grep "1.17" ; git version
 						"""]
 				}
 			}