Correct the path Dockerfiles are built from

serai-dex · Feb 4, 2024 · 3d6ffd1 · 3d6ffd1
1 parent 738f846
commit 3d6ffd1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/orchestration/src/coins/bitcoin.rs b/orchestration/src/coins/bitcoin.rs
@@ -36,7 +36,7 @@ COPY --from=bitcoin --chown=bitcoin bitcoind /bin
 
 EXPOSE 8332 8333
 
-ADD scripts /scripts
+ADD /orchestration/coins/bitcoin/scripts /scripts
 CMD ["/scripts/entry-dev.sh"]
 "#;
 

diff --git a/orchestration/src/coins/monero.rs b/orchestration/src/coins/monero.rs
@@ -37,7 +37,7 @@ COPY --from=monero --chown=monero {monero_binary} /bin
 
 EXPOSE {ports}
 
-ADD scripts /scripts
+ADD /orchestration/coins/{folder}/scripts /scripts
 CMD ["/scripts/entry-dev.sh"]
 "#);
 

diff --git a/orchestration/src/serai.rs b/orchestration/src/serai.rs
@@ -14,7 +14,7 @@ COPY --from=builder --chown=serai /serai/AGPL-3.0 .
 # Run the Serai node
 EXPOSE 30333 9615 9933 9944
 
-ADD scripts /scripts
+ADD /orchestration/serai/scripts /scripts
 CMD ["./scripts/entry-dev.sh"]
 "#;
 

diff --git a/substrate/client/tests/dht.rs b/substrate/client/tests/dht.rs
@@ -9,20 +9,12 @@ async fn dht() {
 
   serai_docker_tests::build("serai".to_string());
 
-  let handle = |name| format!("serai_client-serai_node-{name}");
-  let composition = |name| {
+  let handle = |name: &str| format!("serai_client-serai_node-{name}");
+  let composition = |name: &str| {
     TestBodySpecification::with_image(
       Image::with_repository("serai-dev-serai").pull_policy(PullPolicy::Never),
     )
-    .replace_cmd(vec![
-      "serai-node".to_string(),
-      "--unsafe-rpc-external".to_string(),
-      "--rpc-cors".to_string(),
-      "all".to_string(),
-      "--chain".to_string(),
-      "local".to_string(),
-      format!("--{name}"),
-    ])
+    .replace_env([("SERAI_NAME".to_string(), name.to_string())].into())
     .set_publish_all_ports(true)
     .set_handle(handle(name))
     .set_start_policy(StartPolicy::Strict)

diff --git a/tests/docker/src/lib.rs b/tests/docker/src/lib.rs
@@ -162,14 +162,14 @@ pub fn build(name: String) {
     }
   }
 
-  dockerfile_path.pop();
-
-  println!("Building {} in directory {}...", &name, dockerfile_path.display());
+  println!("Building {}...", &name);
 
   // Version which always prints
   if !Command::new("docker")
-    .current_dir(dockerfile_path)
+    .current_dir(&repo_path)
     .arg("build")
+    .arg("-f")
+    .arg(dockerfile_path)
     .arg(".")
     .arg("-t")
     .arg(format!("serai-dev-{name}"))