Skip to content

Commit

Permalink
dind-network-host patch
Browse files Browse the repository at this point in the history
  • Loading branch information
marko-k0 committed Jul 3, 2024
1 parent 70746ff commit 48d7c14
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion releaseVersion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<Update to ./src/runnerversion when creating release>
2.317.0-hostnetwork
8 changes: 7 additions & 1 deletion src/Runner.Worker/ContainerOperationProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/runnerversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.317.0
2.317.0-hostnetwork

0 comments on commit 48d7c14

Please sign in to comment.