3 Commits

Author SHA1 Message Date
d37a6bbc85 with mkdir 2022-10-30 21:52:40 +01:00
ade5768001 with mkdir 2022-10-30 21:52:31 +01:00
a24a7bdeca with debug 2022-10-30 21:25:14 +01:00
5 changed files with 58 additions and 16 deletions

42
' Normal file
View File

@@ -0,0 +1,42 @@
package main
import (
"context"
"log"
"git.front.kjuulh.io/kjuulh/dagger-go/pkg/builder"
"git.front.kjuulh.io/kjuulh/dagger-go/pkg/cli"
"git.front.kjuulh.io/kjuulh/dagger-go/pkg/pipelines"
)
func main() {
log.Printf("building dagger-go")
err := cli.NewCustomGoBuild("golangbin", func(ctx context.Context) error {
builder, err := builder.New(ctx)
if err != nil {
return err
}
err = pipelines.
New(builder).
WithGolangBin(&pipelines.GolangBinOpts{
DockerImageOpt: &pipelines.DockerImageOpt{
ImageName: "dagger-go",
},
BuildPath: "main.go",
BinName: "main",
BaseImage: "harbor.front.kjuulh.io/docker-proxy/library/docker:dind",
}).
Execute(ctx)
if err != nil {
return err
}
return nil
})
if err != nil {
log.Fatal(err)
}
}

View File

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

View File

@@ -43,6 +43,10 @@ git.front.kjuulh.io/kjuulh/dagger-go v0.0.9 h1:XxKhvUM8q7QcRSTeE7hF56zoXKGOncdHB
git.front.kjuulh.io/kjuulh/dagger-go v0.0.9/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8= git.front.kjuulh.io/kjuulh/dagger-go v0.0.9/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.10 h1:d9VNhI6OsiR/W4/1iJvchuHwTq2C3AHw3yetncKWfUM= git.front.kjuulh.io/kjuulh/dagger-go v0.0.10 h1:d9VNhI6OsiR/W4/1iJvchuHwTq2C3AHw3yetncKWfUM=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.10/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8= git.front.kjuulh.io/kjuulh/dagger-go v0.0.10/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.11 h1:j3ylHiGmhcFomggJcrNJghbYBK/nuuvw0naFBIWqEqo=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.11/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.12 h1:c75Ac8joaOMfaOSPf+ZcvNdBcytx0hzIJMYXexKGXJ0=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.12/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

@@ -25,7 +25,7 @@ func main() {
ImageName: "dagger-go", ImageName: "dagger-go",
}, },
BuildPath: "main.go", BuildPath: "main.go",
BinName: "dagger-go", BinName: "main",
BaseImage: "harbor.front.kjuulh.io/docker-proxy/library/docker:dind", BaseImage: "harbor.front.kjuulh.io/docker-proxy/library/docker:dind",
}). }).
Execute(ctx) Execute(ctx)

View File

@@ -35,7 +35,6 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
var ( var (
bin dagger.FileID bin dagger.FileID
build *dagger.Container build *dagger.Container
scratch *dagger.Container
finalImage *dagger.Container finalImage *dagger.Container
) )
@@ -66,24 +65,21 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
return err return err
}, },
}, },
byg.Step{
Execute: func(ctx byg.Context) error {
if opts.BaseImage == "" {
opts.BaseImage = "harbor.front.kjuulh.io/docker-proxy/library/busybox"
}
scratch = container.LoadImage(client, opts.BaseImage)
return nil
},
},
). ).
Step( Step(
"create-production-image", "create-production-image",
byg.Step{ byg.Step{
Execute: func(ctx byg.Context) error { Execute: func(ctx byg.Context) error {
tempmount := fmt.Sprintf("/tmp/%s", opts.BinName) if opts.BaseImage == "" {
usrbin := fmt.Sprintf("/bin/%s", opts.BinName) opts.BaseImage = "harbor.front.kjuulh.io/docker-proxy/library/busybox"
c := container.MountFileFromLoaded(scratch, bin, tempmount) }
c := container.LoadImage(client, opts.BaseImage)
c = c.Exec(dagger.ContainerExecOpts{
Args: []string{"mkdir", "-p", "/tmp/bin/", "/usr/bin/"},
})
tempmount := fmt.Sprintf("/tmp/bin/%s", opts.BinName)
usrbin := fmt.Sprintf("/usr/bin/%s", opts.BinName)
c = container.MountFileFromLoaded(c, bin, tempmount)
c = c.Exec(dagger.ContainerExecOpts{ c = c.Exec(dagger.ContainerExecOpts{
Args: []string{"cp", tempmount, usrbin}, Args: []string{"cp", tempmount, usrbin},
}) })