2 Commits

Author SHA1 Message Date
c4663856c4 with cgo disabled 2022-10-31 02:02:00 +01:00
217e9c5a4d set another base image 2022-10-31 01:54:39 +01:00
5 changed files with 13 additions and 3 deletions

View File

@@ -2,7 +2,7 @@ module ci
go 1.19 go 1.19
require git.front.kjuulh.io/kjuulh/dagger-go v0.0.29 require git.front.kjuulh.io/kjuulh/dagger-go v0.0.30
require ( require (
dagger.io/dagger v0.3.1 // indirect dagger.io/dagger v0.3.1 // indirect

View File

@@ -73,6 +73,8 @@ git.front.kjuulh.io/kjuulh/dagger-go v0.0.27 h1:FseygX0nNNAGiE7CxSv2qMpo9HagKA0B
git.front.kjuulh.io/kjuulh/dagger-go v0.0.27/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8= git.front.kjuulh.io/kjuulh/dagger-go v0.0.27/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.29 h1:W8I8M8pIddZigw10PKRV3+RATjo8/yBaomfuChHym5A= git.front.kjuulh.io/kjuulh/dagger-go v0.0.29 h1:W8I8M8pIddZigw10PKRV3+RATjo8/yBaomfuChHym5A=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.29/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8= git.front.kjuulh.io/kjuulh/dagger-go v0.0.29/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.30 h1:ME1Eg1GHoPDHQ7idkwVRydchlodLoN5B1uRGyBm880E=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.30/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
github.com/99designs/gqlgen v0.17.2/go.mod h1:K5fzLKwtph+FFgh9j7nFbRUdBKvTcGnsta51fsMTn3o= github.com/99designs/gqlgen v0.17.2/go.mod h1:K5fzLKwtph+FFgh9j7nFbRUdBKvTcGnsta51fsMTn3o=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=

View File

@@ -4,7 +4,7 @@ name: "drone-dagger-test"
steps: steps:
- name: "build" - name: "build"
image: harbor.server.kjuulh.io/kjuulh/dagger-go:1667177181184 image: harbor.server.kjuulh.io/kjuulh/dagger-go:1667177624526
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run

View File

@@ -34,6 +34,7 @@ func BuildGolangBin() *cobra.Command {
}, },
BuildPath: "main.go", BuildPath: "main.go",
BinName: "main", BinName: "main",
CGOEnabled: false,
ExecuteOnEntrypoint: false, ExecuteOnEntrypoint: false,
}). }).
Execute(ctx) Execute(ctx)

View File

@@ -26,6 +26,7 @@ type GolangBinOpts struct {
BinName string BinName string
BaseImage string BaseImage string
ExecuteOnEntrypoint bool ExecuteOnEntrypoint bool
CGOEnabled bool
} }
func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline { func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
@@ -54,6 +55,12 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
} }
c = container.Workdir(c, "/src") c = container.Workdir(c, "/src")
if opts.CGOEnabled {
c = c.WithEnvVariable("CGO_ENABLED", "1")
} else {
c = c.WithEnvVariable("CGO_ENABLED", "0")
}
build, err = golang.Cache(ctx, client, c) build, err = golang.Cache(ctx, client, c)
if err != nil { if err != nil {
return err return err
@@ -73,7 +80,7 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
byg.Step{ byg.Step{
Execute: func(_ byg.Context) error { Execute: func(_ byg.Context) error {
if opts.BaseImage == "" { if opts.BaseImage == "" {
opts.BaseImage = "harbor.server.kjuulh.io/docker-proxy/library/golang" opts.BaseImage = "harbor.server.kjuulh.io/docker-proxy/library/alpine"
} }
binpath := "/usr/bin" binpath := "/usr/bin"