set platform

Author: lsbardel

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 edition = "2024"
 name = "rops"
-version = "0.4.7"
+version = "0.5.0"
 
 [dependencies]
 base64 = "0.22.1"

Cargo.toml

@@ -37,7 +37,6 @@ fn _default_docker_git_sha_arg() -> Option<String> {
     get_default_from_env("DOCKER_GIT_SHA_ARG", None)
 }
 
-
 #[derive(clap::Subcommand, Debug, Clone)]
 pub enum DockerCommand {
     /// Build a new Docker image
@@ -58,7 +57,7 @@ pub enum DockerCommand {
     Push {
         /// Image name
         name: String,
-        /// Architecture
+        /// Add architecture suffix to image tag (e.g. -amd64, -arm64)
         #[arg(long, action = clap::ArgAction::SetTrue)]
         arch: bool,
     },
@@ -94,6 +93,8 @@ impl DockerCommand {
                     .arg("build")
                     .arg("-f")
                     .arg(&dockerfile)
+                    .arg("--platform")
+                    .arg(settings.system.to_string())
                     .arg("-t")
                     .arg(&image_name);
 

src/docker.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use std::process::Command;
+use std::{process::Command};
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct CurrentSystem {
@@ -19,6 +19,13 @@ impl Default for CurrentSystem {
     }
 }
 
+impl std::fmt::Display for CurrentSystem {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}/{}", self.os, self.arch)?;
+        Ok(())
+    }
+}
+
 impl CurrentSystem {
     /// Derives the system architecture by executing `uname -m` and maps `x86_64` to `amd64`.
     fn get_arch() -> (String, Option<String>) {