From 04950cb822de7691d3b20ef0ab3de62ca6a54614 Mon Sep 17 00:00:00 2001
From: Alexey Osipov <me@flcl.me>
Date: Wed, 21 Feb 2024 14:37:59 +0000
Subject: [PATCH] Clean up

---
 transport-interop/impl/zig/v0.0.1/Makefile | 4 +++-
 transport-interop/src/compose-runner.ts    | 6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/transport-interop/impl/zig/v0.0.1/Makefile b/transport-interop/impl/zig/v0.0.1/Makefile
index 84e11da1a..85c7cbc26 100644
--- a/transport-interop/impl/zig/v0.0.1/Makefile
+++ b/transport-interop/impl/zig/v0.0.1/Makefile
@@ -7,7 +7,9 @@ print-cpu-info: image.json
 	docker run --rm --entrypoint /app/zig/bin/zig $$(jq -r .imageID image.json) build-exe --show-builtin
 
 image.json:
-	cd zig-libp2p-${commitSha} && docker build --network=host -t ${image_name} -f interop/Dockerfile .
+	wget -O zig-libp2p-${commitSha}.zip "https://github.com/marcopolo/zig-libp2p/archive/${commitSha}.zip"
+	unzip -o zig-libp2p-${commitSha}.zip
+	cd zig-libp2p-${commitSha} && docker build -t ${image_name} -f interop/Dockerfile .
 	docker image inspect ${image_name} -f "{{.Id}}" | \
 		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
 
diff --git a/transport-interop/src/compose-runner.ts b/transport-interop/src/compose-runner.ts
index 6baaf9db6..dd45afe11 100644
--- a/transport-interop/src/compose-runner.ts
+++ b/transport-interop/src/compose-runner.ts
@@ -9,7 +9,7 @@ import { stringify } from 'yaml';
 import { dialerStdout, dialerTimings } from './compose-stdout-helper';
 
 const exec = util.promisify(execStd);
-const timeoutSecs = 42
+const timeoutSecs = 3 * 60;
 
 export type RunOpts = {
     up: {
@@ -50,9 +50,7 @@ export async function run(namespace: string, compose: ComposeSpecification, opts
         const controller = new AbortController();
         const timeoutId = setTimeout(() => controller.abort(), 1000 * timeoutSecs)
         const { signal } = controller;
-        const dcPath = `docker compose -f ${path.join(dir, "compose.yaml")} up ${upFlags.join(" ")}`
-        console.warn(dcPath)
-        const { stdout, stderr } = await exec(dcPath, { signal })
+        const { stdout, stderr } = await exec(`docker compose -f ${path.join(dir, "compose.yaml")} up ${upFlags.join(" ")}`, { signal })
         clearTimeout(timeoutId)
         try {
             const testResultsParsed = dialerTimings(dialerStdout(stdout))