chore: fix merge conflicts

Author: NathanFlurry

docker/dev-full/rivet-client/config.jsonc

@@ -1,7 +1,6 @@
 {
 	"client": {
 		"runner": {
-			"flavor": "container",
 			// Resource constraints are not supported in Docker
 			// TODO: Needs further investigation in to why nested cgroups v2 resource constraints aren't working
 			"use_resource_constraints": false,

docker/universal/Dockerfile

@@ -47,10 +47,10 @@ RUN \
     --mount=type=cache,target=/root/.cache,id=universal-user-cache \
     --mount=type=cache,target=/root/.npm,id=universal-user-npm \
     --mount=type=cache,target=/root/.yarn,id=universal-user-yarn \
-    RUSTFLAGS="--cfg tokio_unstable" RIVET_BUILD_HUB=0 cargo build --bin rivet-server --bin rivet-edge-server --bin rivet-guard --bin rivet-client --bin rivet-isolate-v8-runner --bin rivet-container-runner && \
+    RUSTFLAGS="--cfg tokio_unstable" RIVET_BUILD_HUB=0 cargo build --bin rivet-server --bin rivet-edge-server --bin rivet-guard --bin rivet-client --bin rivet-container-runner && \
     # cargo install --locked tokio-console && \
     mkdir /app/dist/ && \
-    cp target/debug/rivet-server target/debug/rivet-edge-server target/debug/rivet-guard target/debug/rivet-client target/debug/rivet-isolate-v8-runner target/debug/rivet-container-runner /app/dist/
+    cp target/debug/rivet-server target/debug/rivet-edge-server target/debug/rivet-guard target/debug/rivet-client target/debug/rivet-container-runner /app/dist/
 
 # MARK: Server (full, base)
 FROM debian:12.9-slim AS server-full-base
@@ -205,7 +205,7 @@ COPY ./docker/monolith/rivet-client /etc/rivet-client
 
 # === Copy Build Artifacts === 
 COPY --from=builder /app/dist/rivet-server /usr/local/bin/
-COPY --from=builder /app/dist/rivet-client /app/dist/rivet-isolate-v8-runner /app/dist/rivet-container-runner /usr/local/bin/
+COPY --from=builder /app/dist/rivet-client /app/dist/rivet-container-runner /usr/local/bin/
 
 VOLUME ["/data"]
 

examples/system-test-actor/src/container/main.ts

@@ -20,3 +20,23 @@ createAndStartUdpServer();
 if (process.env.MULTI) {
 	connectToManager();
 }
+
+// TOOD: move this cleaner plac
+// async function contactApi() {
+// 	console.log('Contacting', process.env.RIVET_API_ENDPOINT);
+// 	const res = await fetch(process.env.RIVET_API_ENDPOINT!);
+// 	console.log('API response', res.ok, res.status);
+// }
+//
+// contactApi();
+
+// TODO: Move this cleaner place
+// Print hosts file contents before starting
+// try {
+// 	const hostsContent = fs.readFileSync('/etc/hosts', 'utf8');
+// 	console.log('=== /etc/hosts contents ===');
+// 	console.log(hostsContent);
+// 	console.log('=== End of /etc/hosts ===');
+// } catch (err) {
+// 	console.error('Failed to read /etc/hosts:', err);
+// }

examples/system-test-actor/src/main.ts

@@ -44,13 +44,13 @@ async function run() {
 								guard: {},
 							},
 						},
-						// udp: {
-						// 	protocol: "udp",
-						// 	// internalPort: 80,
-						// 	routing: {
-						// 		host: {},
-						// 	},
-						// },
+						udp: {
+							protocol: "udp",
+							// internalPort: 80,
+							routing: {
+								host: {},
+							},
+						},
 					},
 				},
 				runtime: {

examples/system-test-actor/tests/client.ts

@@ -19,12 +19,6 @@ if [ "__FLAVOR__" = "container" ]; then
 	chmod +x /usr/local/bin/rivet-container-runner
 fi
 
-if [ "__FLAVOR__" = "isolate" ]; then
-	echo 'Downloading pegboard isolate runner'
-	curl -Lf -o /usr/local/bin/rivet-isolate-v8-runner "__ISOLATE_V8_RUNNER_BINARY_URL__"
-	chmod +x /usr/local/bin/rivet-isolate-v8-runner
-fi
-
 # For clarity
 FDB_VERSION="__FDB_VERSION__"
 

packages/core/services/cluster/src/workflows/server/install/install_scripts/files/pegboard_install.sh

@@ -256,7 +256,7 @@ fn mounts(opts: &ConfigOpts) -> Result<serde_json::Value> {
 		{
 			"destination": "/etc/hosts",
 			"type": "bind",
-			"source": opts.actor_path.join("hosts").to_str().context("hosts path")?,
+			"source": opts.runner_path.join("hosts").to_str().context("hosts path")?,
 			"options": ["rbind", "rprivate"]
 		},
 

packages/edge/infra/client/manager/src/runner/oci_config.rs

@@ -655,7 +655,7 @@ async fn poll_build_status(
 									&ctx,
 									crate::util::actor::logs::TailOpts {
 										environment: CI_ENVIRONMENT_ID,
-										actor_id,
+										actor_id: actor_id.to_string(),
 										stream: crate::util::actor::logs::LogStream::All,
 										follow: true,
 										print_type: crate::util::actor::logs::PrintType::Custom(

packages/toolchain/toolchain/src/util/docker/build_remote.rs

@@ -4,6 +4,7 @@ const REPOS = [
 	{ name: "rivetgg/rivet-server", prefix: "slim", main: true },
 	{ name: "rivetgg/rivet-server", prefix: "full" },
 	{ name: "rivetgg/rivet-client", prefix: "full", main: true },
+	{ name: "rivetgg/rivet-client", prefix: "container-runner" },
 	//{ name: "rivetgg/rivet", prefix: "monolith", main: true },
 ]