diff --git a/ci/go.mod b/ci/go.mod index cd0c03f..fcccdb1 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.9 +require git.front.kjuulh.io/kjuulh/dagger-go v0.0.10 require ( dagger.io/dagger v0.3.1 // indirect diff --git a/ci/go.sum b/ci/go.sum index a8fcb5b..3901b56 100644 --- a/ci/go.sum +++ b/ci/go.sum @@ -41,6 +41,8 @@ git.front.kjuulh.io/kjuulh/dagger-go v0.0.8 h1:hbXEOYw3Q3sdwMjaEMz+v/TOnyUWSDAYF git.front.kjuulh.io/kjuulh/dagger-go v0.0.8/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8= git.front.kjuulh.io/kjuulh/dagger-go v0.0.9 h1:XxKhvUM8q7QcRSTeE7hF56zoXKGOncdHBdccKBKnS6M= 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/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 0b1ac39..e542293 100644 --- a/pkg/pipelines/golang-bin.go +++ b/pkg/pipelines/golang-bin.go @@ -82,12 +82,12 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline { byg.Step{ Execute: func(ctx byg.Context) error { tempmount := fmt.Sprintf("/tmp/%s", opts.BinName) - usrbin := fmt.Sprintf("/usr/bin/%s", opts.BinName) + usrbin := fmt.Sprintf("/bin/%s", opts.BinName) c := container.MountFileFromLoaded(scratch, bin, tempmount) c = c.Exec(dagger.ContainerExecOpts{ - Args: []string{"mkdir", "-p", "/usr/bin", "&&", "cp", tempmount, usrbin}, + Args: []string{"cp", tempmount, usrbin}, }) - finalImage = c.WithEntrypoint([]string{opts.BinName}) + finalImage = c.WithEntrypoint([]string{usrbin}) return nil },