Try cross build with target images

Author: joepio

.dagger/src/index.ts

@@ -271,17 +271,58 @@ export class AtomicServer {
   @func()
   rustCrossBuild(@argument() target: string): Container {
     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
       .container()
-      .from(RUST_IMAGE)
-      .withExec(["cargo", "install", "cross"])
-      .withMountedDirectory("/code", source)
-      .withWorkdir("/code")
-      .withExec(["rustup", "target", "add", target]);
+      .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);
 
-    return rustContainer
-      .withExec(["cross", "build", "--target", target, "--release"])
-      .withExec([`./target/${target}/release/atomic-server`, "--version"]);
+    const sourceContainer = rustContainer
+      .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"]);
+
+    // Include frontend assets for the server build
+    const browserDir = this.jsBuild().directory("/app/data-browser/dist");
+    const containerWithAssets = sourceContainer.withDirectory(
+      "/home/rust/src/server/assets_tmp",
+      browserDir
+    );
+
+    // Build using the pre-configured cross-compilation environment
+    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",
+      ]);
   }
 
   @func()
@@ -378,9 +419,7 @@ export class AtomicServer {
     const crossBuildContainer = this.rustCrossBuild(
       "x86_64-unknown-linux-musl"
     );
-    const binaryFile = crossBuildContainer.file(
-      "/code/target/x86_64-unknown-linux-musl/release/atomic-server"
-    );
+    const binaryFile = crossBuildContainer.file("/atomic-server-binary");
 
     // Create deployment container with SSH client
     const deployContainer = dag
@@ -431,24 +470,4 @@ export class AtomicServer {
 
     return `Deployment to ${remoteHost} completed successfully:\n${deployResult}`;
   }
-
-  @func()
-  async deployStaging(
-    @argument() remoteUser: Secret,
-    @argument() sshPrivateKey: Secret
-  ): Promise<string> {
-    return this.deployServer(
-      "staging.atomicdata.dev",
-      remoteUser,
-      sshPrivateKey
-    );
-  }
-
-  @func()
-  async deployProduction(
-    @argument() remoteUser: Secret,
-    @argument() sshPrivateKey: Secret
-  ): Promise<string> {
-    return this.deployServer("atomicdata.dev", remoteUser, sshPrivateKey);
-  }
 }

.github/workflows/deployment.yml

@@ -20,41 +20,15 @@ jobs:
     environment: ${{ inputs.environment }}
     runs-on: ubuntu-latest
     env:
-      EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
+      REMOTE_USER: ${{ secrets.REMOTE_USER }}
+      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
     steps:
-      - uses: actions/checkout@v2
-
-      - uses: earthly/actions-setup@v1
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Deploy using Dagger
+        uses: dagger/[email protected]
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
           version: "latest"
-
-      - name: Set env
-        run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF#refs/*/})" >> $GITHUB_ENV
-
-      - name: Earthly build
-        run: earthly --org ontola --sat henk -P +cross-build -TARGET=x86_64-unknown-linux-musl
-
-      - name: Transfer binary rsync
-        uses: easingthemes/ssh-deploy@v3
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-          ARGS: "-rltgoDzvO"
-          SOURCE: "./artifact/bin/atomic-server-x86_64-unknown-linux-musl"
-          REMOTE_HOST: ${{ inputs.remote_host }}
-          REMOTE_USER: ${{ secrets.REMOTE_USER }}
-          TARGET: ~/
-
-      - name: executing remote ssh commands using ssh key
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ inputs.remote_host }}
-          username: ${{ secrets.REMOTE_USER }}
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          script: |
-            mv ~/atomic-server-x86_64-unknown-linux-musl ~/atomic-server
-            cp ~/atomic-server ~/atomic-server-$(date +'%Y-%m-%dT%H:%M:%S')
-            systemctl stop atomic
-            ./atomic-server export &&
-            systemctl start atomic
-            systemctl status atomic
+          verb: call
+          args: deploy-server --remote-host ${{ inputs.remote_host }} --remote-user env://REMOTE_USER --ssh-private-key env://SSH_PRIVATE_KEY
+          cloud-token: ${{ secrets.DAGGER_CLOUD_TOKEN }}