From 2f2a4e0a314b82462f822a182b5394c61c5aa57e Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 1 Apr 2022 09:36:47 +0200 Subject: [PATCH] universe: go: add git by default in go.#Image Signed-off-by: Vincent Demeester --- pkg/universe.dagger.io/go/image.cue | 2 ++ pkg/universe.dagger.io/go/test/image.cue | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/universe.dagger.io/go/image.cue b/pkg/universe.dagger.io/go/image.cue index 4056dc47..d2f2f5bb 100644 --- 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 index 0aab3182..b8369b8a 100644 --- 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 """] } }