From 48d7c14c9db33b6db81b4bbc5652598461ebdd84 Mon Sep 17 00:00:00 2001
From: Marko Kosmerl <marko@mktemp.net>
Date: Wed, 3 Jul 2024 15:59:44 +0000
Subject: [PATCH] dind-network-host patch

---
 images/Dockerfile                               | 4 ++--
 releaseVersion                                  | 2 +-
 src/Runner.Worker/ContainerOperationProvider.cs | 8 +++++++-
 src/runnerversion                               | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/images/Dockerfile b/images/Dockerfile
index 39f1ab05674..4ebbcdfaba7 100644
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -6,14 +6,14 @@ ARG TARGETARCH
 ARG RUNNER_VERSION
 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.1
 ARG DOCKER_VERSION=25.0.5
-ARG BUILDX_VERSION=0.13.2
+ARG BUILDX_VERSION=0.14.1
 
 RUN apt update -y && apt install curl unzip -y
 
 WORKDIR /actions-runner
 RUN export RUNNER_ARCH=${TARGETARCH} \
     && if [ "$RUNNER_ARCH" = "amd64" ]; then export RUNNER_ARCH=x64 ; fi \
-    && curl -f -L -o runner.tar.gz https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-${TARGETOS}-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \
+    && curl -f -L -o runner.tar.gz https://github.com/dfinity/runner/releases/download/v${RUNNER_VERSION}/actions-runner-${TARGETOS}-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \
     && tar xzf ./runner.tar.gz \
     && rm runner.tar.gz
 
diff --git a/releaseVersion b/releaseVersion
index ef96e25e847..a43e52b0cf2 100644
--- a/releaseVersion
+++ b/releaseVersion
@@ -1 +1 @@
-<Update to ./src/runnerversion when creating release>
+2.317.0-hostnetwork
\ No newline at end of file
diff --git a/src/Runner.Worker/ContainerOperationProvider.cs b/src/Runner.Worker/ContainerOperationProvider.cs
index c5cccb77ef0..8ff34cd358e 100644
--- a/src/Runner.Worker/ContainerOperationProvider.cs
+++ b/src/Runner.Worker/ContainerOperationProvider.cs
@@ -92,11 +92,16 @@ public async Task StartContainersAsync(IExecutionContext executionContext, objec
 
             // Create local docker network for this job to avoid port conflict when multiple runners run on same machine.
             // All containers within a job join the same network
+            /*
+            XXX: don't add network as we'll use --network host
             executionContext.Output("##[group]Create local container network");
             var containerNetwork = $"github_network_{Guid.NewGuid().ToString("N")}";
             await CreateContainerNetworkAsync(executionContext, containerNetwork);
             executionContext.JobContext.Container["network"] = new StringContextData(containerNetwork);
             executionContext.Output("##[endgroup]");
+            */
+            var containerNetwork = "host";
+            executionContext.JobContext.Container["network"] = new StringContextData(containerNetwork);
 
             foreach (var container in containers)
             {
@@ -160,7 +165,8 @@ public async Task StopContainersAsync(IExecutionContext executionContext, object
                 await StopContainerAsync(executionContext, container);
             }
             // Remove the container network
-            await RemoveContainerNetworkAsync(executionContext, containers.First().ContainerNetwork);
+            // XXX: we're using --network host
+            //await RemoveContainerNetworkAsync(executionContext, containers.First().ContainerNetwork);
         }
 
         private async Task StartContainerAsync(IExecutionContext executionContext, ContainerInfo container)
diff --git a/src/runnerversion b/src/runnerversion
index f7103c080f6..a43e52b0cf2 100644
--- a/src/runnerversion
+++ b/src/runnerversion
@@ -1 +1 @@
-2.317.0
+2.317.0-hostnetwork
\ No newline at end of file