From 9c8a3719ce74cd061786531ece1797f5dad8db0e Mon Sep 17 00:00:00 2001
From: kjuulh <contact@kjuulh.io>
Date: Sun, 6 Nov 2022 01:11:45 +0100
Subject: [PATCH] Updated to image thwich can handle musl

---
 pkg/pipelines/rust-bin.go                    | 22 +++++++++++++++++++-
 pkg/tasks/rust-bin/build.go                  | 12 -----------
 templates/bust_rustbin_default_template.yaml |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkg/pipelines/rust-bin.go b/pkg/pipelines/rust-bin.go
index d310b53..61cc8e9 100644
--- a/pkg/pipelines/rust-bin.go
+++ b/pkg/pipelines/rust-bin.go
@@ -41,7 +41,27 @@ func (p *Pipeline) WithRustBin(opts *RustBinOpts) *Pipeline {
 					c := container.LoadImage(client, "harbor.server.kjuulh.io/docker-proxy/library/rust:buster")
 					c = c.Exec(dagger.ContainerExecOpts{
 						Args: []string{
-							"apt install musl-tools",
+							"apt", "update", "-y",
+						},
+					})
+					if _, err := c.ExitCode(ctx); err != nil {
+						return err
+					}
+					c = c.Exec(dagger.ContainerExecOpts{
+						Args: []string{
+							"apt", "install", "musl-tools", "-y",
+						},
+					})
+					if _, err := c.ExitCode(ctx); err != nil {
+						return err
+					}
+
+					c = c.Exec(dagger.ContainerExecOpts{
+						Args: []string{
+							"rustup",
+							"target",
+							"add",
+							"x86_64-unknown-linux-musl",
 						},
 					})
 					if _, err := c.ExitCode(ctx); err != nil {
diff --git a/pkg/tasks/rust-bin/build.go b/pkg/tasks/rust-bin/build.go
index 93ebaa2..d442ea8 100644
--- a/pkg/tasks/rust-bin/build.go
+++ b/pkg/tasks/rust-bin/build.go
@@ -11,18 +11,6 @@ import (
 func Build(ctx context.Context, container *dagger.Container, binName string) (dagger.FileID, error) {
 	log.Printf("building binary: (binName=%s)", binName)
 	c := container.Exec(dagger.ContainerExecOpts{
-		Args: []string{
-			"rustup",
-			"target",
-			"add",
-			"x86_64-unknown-linux-musl",
-		},
-	})
-	if _, err := c.ExitCode(ctx); err != nil {
-		return "", err
-	}
-
-	c = c.Exec(dagger.ContainerExecOpts{
 		Args: []string{
 			"cargo",
 			"build",
diff --git a/templates/bust_rustbin_default_template.yaml b/templates/bust_rustbin_default_template.yaml
index 025ffcc..434459f 100644
--- a/templates/bust_rustbin_default_template.yaml
+++ b/templates/bust_rustbin_default_template.yaml
@@ -4,7 +4,7 @@ name: "drone-dagger-test"
 
 steps:
   - name: "build"
-    image: harbor.server.kjuulh.io/kjuulh/bust:1667692696139
+    image: harbor.server.kjuulh.io/kjuulh/bust:166769342945
     volumes:
       - name: dockersock
         path: /var/run