chore: show docker approach.

Author: l-monninger

Cargo.lock

@@ -181,9 +181,9 @@ mtma-migrator-test-types = { path = "checks/migrator/util/types" }
 movement-syncing = { path = "util/movement/movement-syncing" }
 movement-core = { path = "util/movement/movement-core" }
 movement-util = { path = "util/movement/movement-util" }
-movement-aptos-core-inner = { path = "util/movement-aptos/movement-aptos-core-inner" }
 movement-aptos = { path = "util/movement-aptos/movement-aptos" }
 movement-aptos-core = { path = "util/movement-aptos/movement-aptos-core" }
+movement-aptos-util = { path = "util/movement-aptos/movement-aptos-util" }
 
 [workspace.lints.clippy]
 debug_assert_with_mut_call = "deny"

Cargo.toml

@@ -9,11 +9,35 @@ publish = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-movement-aptos-core-inner = { workspace = true }
-movement-aptos = { workspace = true }
+thiserror = { workspace = true }
+serde = { workspace = true }
+anyhow = { workspace = true }
+hex = { workspace = true }
+syncador = { workspace = true }
+tokio = { workspace = true }
+aptos-node = { workspace = true }
+aptos-config = { workspace = true }
+serde_json = { workspace = true }
+clap = { workspace = true }
+jsonlvar = { workspace = true }
+orfile = { workspace = true }
+kestrel = { workspace = true }
+reqwest = { workspace = true }
+aptos-cached-packages = { workspace = true }
+rand = { workspace = true }
+chrono = { workspace = true }
+uuid = { workspace = true }
+movement-aptos-util = { workspace = true }
+
+[dev-dependencies]
+uuid = { workspace = true }
+chrono = { workspace = true }
 
 [build-dependencies]
-cargo_metadata = { workspace = true }
+tokio = { workspace = true }
+ready-docker = { workspace = true }
+movement-aptos-util = { workspace = true }
+anyhow = { workspace = true }
 
 [lints]
 workspace = true

util/movement-aptos/movement-aptos-core-inner/Cargo.toml

@@ -1,13 +1,15 @@
-// make sure that `movement-aptos` is built from the workspace
-use std::process::Command;
+use movement_aptos_util::CONTAINERS;
 
-fn main() {
-	// check that `movement-aptos` exists
-	let binary_name =
-		if cfg!(target_os = "windows") { "movement-aptos.exe" } else { "movement-aptos" };
-
-	let output = Command::new(binary_name).output().expect("Failed to run 'movement-aptos");
-	if !output.status.success() {
-		panic!("'movement-aptos' failed to run with status: {}", output.status);
+#[tokio::main]
+async fn main() -> Result<(), anyhow::Error> {
+	let mut readier: ready_docker::Buildtime<ready_docker::Noop, ready_docker::Noop> =
+		ready_docker::Buildtime::new();
+	for container in CONTAINERS {
+		readier.add_image(container.to_string());
+	}
+	if !readier.build().await.is_err() {
+		panic!("Expected error for arm64 pull: this means that the image is now available and you should update this implementation");
 	}
+
+	Ok(())
 }

util/movement-aptos/movement-aptos-core-inner/src/lib.rs

@@ -1,2 +1,5 @@
-pub use ::movement_aptos::*;
-pub use movement_aptos_core_inner::*;
+pub mod config;
+pub mod movement_aptos;
+
+pub use config::*;
+pub use movement_aptos::*;

util/movement-aptos/movement-aptos-core/Cargo.toml

@@ -154,15 +154,35 @@ where
 
 		// spawn the node in a new process
 		let command = Command::line(
-			"movement-aptos",
+			"docker",
 			vec![
+				// mount the workspace to /app
 				"run",
-				"using",
+				"-v",
+				&format!(
+					"{}:/app",
+					self.workspace
+						.to_str()
+						.context("Failed to convert workspace to str")
+						.map_err(|e| MovementAptosError::Internal(e.into()))?
+				),
+				&movement_aptos_util::VALIDATOR.to_string(),
+				// use the config path
 				"--config-path",
-				config_path
-					.to_str()
-					.context("Failed to convert config path to str")
-					.map_err(|e| MovementAptosError::Internal(e.into()))?,
+				&format!(
+					"/app/{}",
+					config_path
+						.to_str()
+						.context("Failed to convert config path to str")
+						.map_err(|e| MovementAptosError::Internal(e.into()))?
+				),
+				// expose the port
+				"-p",
+				&format!(
+					"{}:{}",
+					self.node_config.api.address.port(),
+					self.node_config.api.address.port()
+				),
 			],
 			None,
 			false,