Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dind-network-host patch #4

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

dind-network-host patch #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48d7c14
dind-network-host patch
marko-k0 Jul 3, 2024
38eb6c9
2.317.0
marko-k0 Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions images/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<Update to ./src/runnerversion when creating release>
2.317.0
8 changes: 7 additions & 1 deletion src/Runner.Worker/ContainerOperationProvider.cs
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.317.0
2.317.0
Loading