diff --git a/ci/go.mod b/ci/go.mod index a3498d3..eecdc5d 100644 --- a/ci/go.mod +++ b/ci/go.mod @@ -2,7 +2,7 @@ module ci go 1.19 -require git.front.kjuulh.io/kjuulh/dagger-go v0.0.19 +require git.front.kjuulh.io/kjuulh/dagger-go v0.0.20 require ( dagger.io/dagger v0.3.1 // indirect diff --git a/ci/go.sum b/ci/go.sum index 4efa3b2..7c69110 100644 --- a/ci/go.sum +++ b/ci/go.sum @@ -57,6 +57,8 @@ git.front.kjuulh.io/kjuulh/dagger-go v0.0.18 h1:asW/jEmf3HORb6nqgUldoLge/UjEFFnI git.front.kjuulh.io/kjuulh/dagger-go v0.0.18/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8= git.front.kjuulh.io/kjuulh/dagger-go v0.0.19 h1:IgpZ1X5ZDYl/byBSife1wXTBmFHNvHwf1MLw8AZ29R4= git.front.kjuulh.io/kjuulh/dagger-go v0.0.19/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8= +git.front.kjuulh.io/kjuulh/dagger-go v0.0.20 h1:iw/gnsaGe4SzqbRT6i14LPvu/Cpbe7XiCpnqFfkTLA8= +git.front.kjuulh.io/kjuulh/dagger-go v0.0.20/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8= 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/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= diff --git a/pkg/pipelines/golang-bin.go b/pkg/pipelines/golang-bin.go index 4969552..7ba8b69 100644 --- a/pkg/pipelines/golang-bin.go +++ b/pkg/pipelines/golang-bin.go @@ -73,18 +73,10 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline { if opts.BaseImage == "" { opts.BaseImage = "harbor.front.kjuulh.io/docker-proxy/library/busybox" } - 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{ - Args: []string{ - "cp", tempmount, opts.BinName, - }, - }) + c := container.LoadImage(client, opts.BaseImage) + c = container.MountFileFromLoaded(c, bin, usrbin) finalImage = c.WithEntrypoint([]string{usrbin}) return nil