kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

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

Browse Source 
universe: go: add git by default in go.#Image
This commit is contained in:
Andrea Luzzardi 2022-04-04 15:31:42 -07:00 committed by GitHub
commit d79de11fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/universe.dagger.io/go/image.cue
View File

@ -12,6 +12,8 @@ _#DefaultVersion: "1.18"
version: *_#DefaultVersion | string version: *_#DefaultVersion | string
packages: [pkgName=string]: version: 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 // FIXME Basically a copy of alpine.#Build with a different image
// Should we create a special definition? // Should we create a special definition?

4
pkg/universe.dagger.io/go/test/image.cue
View File

@ -18,7 +18,7 @@ dagger.#Plan & {
command: { command: {
name: "/bin/sh" name: "/bin/sh"
args: ["-c", """ args: ["-c", """
go version | grep "1.18" go version | grep "1.18" ; git version
"""] """]
} }
} }
@ -35,7 +35,7 @@ dagger.#Plan & {
command: { command: {
name: "/bin/bash" name: "/bin/bash"
args: ["-c", """ args: ["-c", """
go version | grep "1.17" go version | grep "1.17" ; git version
"""] """]
} }
} }