Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1f20e5f
point docker image to our fork
cgundy Aug 15, 2024
3b9c15c
dont add network
cgundy Aug 15, 2024
fed0e2d
update workflow to run on branch dind-network-host-patch
cgundy Aug 15, 2024
1c07ef2
Update release.yml
cgundy Aug 15, 2024
93c2766
Merge branch 'actions:main' into dind-network-host-patch
cgundy Aug 19, 2024
202886d
change it back
cgundy Aug 19, 2024
ac9c335
Update Dockerfile
cgundy Aug 19, 2024
4bf0e1b
v2.320.0 release
ericsciple Oct 3, 2024
78f2167
Fix release workflow to use distinct artifact names
ericsciple Oct 3, 2024
46b793a
Merge remote-tracking branch 'origin/dind-network-host-patch' into di…
basvandijk Nov 12, 2024
9273beb
Merge pull request #12 from dfinity/releases/dind-network-host-patch-…
cgundy Dec 2, 2024
3722508
Merge branch 'actions:main' into dind-network-host-patch
cgundy Dec 2, 2024
1c41261
chore(IDX): upgrade to v2.321.0
cgundy Dec 2, 2024
b8c7341
Merge pull request #15 from actions/main
cgundy Dec 2, 2024
1821a99
Merge branch 'main' into releases/dind-network-host-patch-v2.321.0
marko-k0 Mar 25, 2025
6ea8a57
version bump
marko-k0 Mar 25, 2025
1cd7210
Merge branch 'main' into releases/dind-network-host-patch-v2.324.0
marko-k0 May 13, 2025
e29731a
version bump
marko-k0 May 13, 2025
c37b3f7
Merge pull request #25 from actions/main
cgundy Jun 4, 2025
5becc52
Merge pull request #26 from dfinity/main
cgundy Jun 4, 2025
15f7371
version bump
cgundy Jun 4, 2025
c2db2f7
chore(IDX): upgrade runner to v2.327.1
cgundy Jul 28, 2025
e4a79a8
update to windows-2022
cgundy Jul 28, 2025
8e63186
Merge branch 'main' into releases/dind-network-host-patch-v2.327.0
cgundy Jul 28, 2025
0ff762a
change back
cgundy Jul 28, 2025
8df25ce
Update releaseVersion
cgundy Jul 28, 2025
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
2 changes: 1 addition & 1 deletion images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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.327.1
9 changes: 7 additions & 2 deletions src/Runner.Worker/ContainerOperationProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +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)
{
container.ContainerNetwork = containerNetwork;
Expand Down Expand Up @@ -160,7 +164,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.327.0
2.327.1
Loading