Cross iteration

Author: joepio

.dagger/src/index.ts

@@ -269,43 +269,57 @@ export class AtomicServer {
   }
 
   @func()
+  /** Doesn't work on M1 macs */
   rustCrossBuild(@argument() target: string): Container {
+    let engineSvc = dag.docker().engine();
     const source = this.source;
-    const cargoCache = dag.cacheVolume("cargo");
-
-    // Use rust-musl-cross images which support multi-arch builds
-    // Map target to the appropriate image tag
-    let imageTag: string;
-    switch (target) {
-      case "x86_64-unknown-linux-musl":
-        imageTag = "x86_64-musl";
-        break;
-      case "aarch64-unknown-linux-musl":
-        imageTag = "aarch64-musl";
-        break;
-      case "armv7-unknown-linux-musleabihf":
-        imageTag = "armv7-musleabihf";
-        break;
-      default:
-        throw new Error(`Unsupported cross-compilation target: ${target}`);
-    }
 
-    const rustContainer = dag
+    const sourceContainer = dag
       .container()
-      .from(`ghcr.io/rust-cross/rust-musl-cross:${imageTag}`)
-      .withExec(["apt-get", "update", "-qq"])
-      .withExec(["apt-get", "install", "-y", "nasm"])
-      .withMountedCache("/home/rust/.cargo/registry", cargoCache);
-
-    const sourceContainer = rustContainer
+      .from("docker:cli")
+      .withServiceBinding("docker", engineSvc)
+      .withEnvVariable("DOCKER_HOST", "tcp://docker:2375")
+      .withExec(["docker", "ps"])
+      .withExec([
+        "apk",
+        "add",
+        "--no-cache",
+        // For installing rust
+        "curl",
+        // CC linker deps, compiling cross
+        "build-base",
+        "gcc",
+        "musl-dev",
+        "cmake",
+      ])
+      .withExec([
+        "sh",
+        "-c",
+        "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable",
+      ])
+      .withEnvVariable(
+        "PATH",
+        "/root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+      )
+      .withExec(["docker", "ps"])
+      .withExec(["cargo", "install", "cross"])
+      .withExec(["rustup", "target", "add", target])
+      .withExec([
+        "rustup",
+        "toolchain",
+        "add",
+        "stable-x86_64-unknown-linux-gnu",
+        "--profile",
+        "minimal",
+        "--force-non-host",
+      ])
       .withFile("/home/rust/src/Cargo.toml", source.file("Cargo.toml"))
       .withFile("/home/rust/src/Cargo.lock", source.file("Cargo.lock"))
       .withDirectory("/home/rust/src/server", source.directory("server"))
       .withDirectory("/home/rust/src/lib", source.directory("lib"))
       .withDirectory("/home/rust/src/cli", source.directory("cli"))
       .withMountedCache("/home/rust/src/target", dag.cacheVolume("rust-target"))
-      .withWorkdir("/home/rust/src")
-      .withExec(["cargo", "fetch"]);
+      .withWorkdir("/home/rust/src");
 
     // Include frontend assets for the server build
     const browserDir = this.jsBuild().directory("/app/data-browser/dist");
@@ -314,15 +328,12 @@ export class AtomicServer {
       browserDir
     );
 
-    // Build using the pre-configured cross-compilation environment
+    // Build using native cargo with target specification
+    const binaryPath = `./target/${target}/release/atomic-server`;
+
     return containerWithAssets
-      .withExec(["cargo", "build", "--target", target, "--release"])
-      .withExec([`./target/${target}/release/atomic-server`, "--version"])
-      .withExec([
-        "cp",
-        `./target/${target}/release/atomic-server`,
-        "/atomic-server-binary",
-      ]);
+      .withExec(["cross", "build", "--target", target, "--release"])
+      .withExec(["cp", binaryPath, "/atomic-server-binary"]);
   }
 
   @func()
@@ -470,4 +481,34 @@ export class AtomicServer {
 
     return `Deployment to ${remoteHost} completed successfully:\n${deployResult}`;
   }
+
+  @func()
+  async rustCrossMultiBuild(
+    @argument()
+    targets: string[] = [
+      "x86_64-unknown-linux-musl",
+      "aarch64-unknown-linux-musl",
+      "armv7-unknown-linux-musleabihf",
+    ]
+  ): Promise<Directory> {
+    const builds = targets.map((target) => {
+      const container = this.rustCrossBuild(target);
+      return {
+        target,
+        binary: container.file("/atomic-server-binary"),
+      };
+    });
+
+    // Create a directory with all the binaries
+    let outputDir = dag.directory();
+
+    for (const build of builds) {
+      outputDir = outputDir.withFile(
+        `atomic-server-${build.target}`,
+        build.binary
+      );
+    }
+
+    return outputDir;
+  }
 }

.dagger/tsconfig.json

@@ -6,8 +6,12 @@
     "strict": true,
     "skipLibCheck": true,
     "paths": {
-      "@dagger.io/dagger": ["./sdk/index.ts"],
-      "@dagger.io/dagger/telemetry": ["./sdk/telemetry.ts"]
+      "@dagger.io/dagger": [
+        "./sdk/index.ts"
+      ],
+      "@dagger.io/dagger/telemetry": [
+        "./sdk/telemetry.ts"
+      ]
     }
   }
-}
+}

Cross.toml

@@ -5,6 +5,7 @@
 #   "apt-get install --assume-yes nasm:$CROSS_DEB_ARCH",
 # ]
 [target.x86_64-unknown-linux-musl]
+image = "ghcr.io/cross-rs/x86_64-unknown-linux-musl:edge"
 pre-build = [
   "dpkg --add-architecture $CROSS_DEB_ARCH",
   "apt-get update",
@@ -16,3 +17,19 @@ pre-build = [
 #   "apt-get update",
 #   "apt-get install --assume-yes nasm:$CROSS_DEB_ARCH",
 # ]
+
+[target.aarch64-unknown-linux-musl]
+image = "ghcr.io/cross-rs/aarch64-unknown-linux-musl:edge"
+pre-build = [
+  "dpkg --add-architecture $CROSS_DEB_ARCH",
+  "apt-get update",
+  "apt-get install --assume-yes nasm:$CROSS_DEB_ARCH",
+]
+
+[target.armv7-unknown-linux-musleabihf]
+image = "ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:edge"
+pre-build = [
+  "dpkg --add-architecture $CROSS_DEB_ARCH",
+  "apt-get update",
+  "apt-get install --assume-yes nasm:$CROSS_DEB_ARCH",
+]

dagger.json

@@ -4,5 +4,12 @@
   "sdk": {
     "source": "typescript"
   },
+  "dependencies": [
+    {
+      "name": "docker",
+      "source": "github.com/shykes/x/docker@811fa8a47958c484441304cec08d6fe30a7550b3",
+      "pin": "811fa8a47958c484441304cec08d6fe30a7550b3"
+    }
+  ],
   "source": ".dagger"
 }