From 048188af2730081a655f98d88a0e7fecbdfab12b Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Thu, 13 Jun 2024 15:53:57 +0000 Subject: [PATCH 01/13] patch --- images/Dockerfile | 4 ++-- releaseVersion | 2 +- src/Runner.Worker/Container/DockerCommandManager.cs | 6 +++++- src/Runner.Worker/ContainerOperationProvider.cs | 9 +++++++-- src/runnerversion | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/images/Dockerfile b/images/Dockerfile index 707da217691..17b66b15b86 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -6,14 +6,14 @@ ARG TARGETARCH ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.0 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..6f508d398dc 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ - +2.317.0-dfinity diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs index 41b914a5ee0..ccaa1a0d314 100644 --- a/src/Runner.Worker/Container/DockerCommandManager.cs +++ b/src/Runner.Worker/Container/DockerCommandManager.cs @@ -113,6 +113,9 @@ public async Task DockerCreate(IExecutionContext context, ContainerInfo // OPTIONS dockerOptions.Add($"--name {container.ContainerDisplayName}"); dockerOptions.Add($"--label {DockerInstanceLabel}"); + // TODO: pull opts from env + dockerOptions.Add("--privileged"); + dockerOptions.Add("--cgroupns host"); if (!string.IsNullOrEmpty(container.ContainerWorkDirectory)) { dockerOptions.Add($"--workdir {container.ContainerWorkDirectory}"); @@ -286,7 +289,8 @@ public async Task DockerNetworkCreate(IExecutionContext context, string net #if OS_WINDOWS return await ExecuteDockerCommandAsync(context, "network", $"create --label {DockerInstanceLabel} {network} --driver nat", context.CancellationToken); #else - return await ExecuteDockerCommandAsync(context, "network", $"create --label {DockerInstanceLabel} {network}", context.CancellationToken); + // TODO: make conditional + //return await ExecuteDockerCommandAsync(context, "network", $"create --label {DockerInstanceLabel} {network}", context.CancellationToken); #endif } diff --git a/src/Runner.Worker/ContainerOperationProvider.cs b/src/Runner.Worker/ContainerOperationProvider.cs index c5cccb77ef0..63c19c0199a 100644 --- a/src/Runner.Worker/ContainerOperationProvider.cs +++ b/src/Runner.Worker/ContainerOperationProvider.cs @@ -92,19 +92,24 @@ 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 + /* 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]"); + */ + // TODO: conditional logic + var containerNetwork = "host"; + executionContext.JobContext.Container["network"] = new StringContextData(containerNetwork); foreach (var container in containers) { container.ContainerNetwork = containerNetwork; await StartContainerAsync(executionContext, container); } - - await RunContainersHealthcheck(executionContext, containers); + // TODO: conditional logic + //await RunContainersHealthcheck(executionContext, containers); } public async Task RunContainersHealthcheck(IExecutionContext executionContext, List containers) diff --git a/src/runnerversion b/src/runnerversion index f7103c080f6..6f508d398dc 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.317.0 +2.317.0-dfinity From ba4ec1a6a8ffad9a4a97ab0400f450877117d3b2 Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Thu, 13 Jun 2024 15:57:11 +0000 Subject: [PATCH 02/13] change --- src/Runner.Worker/Container/DockerCommandManager.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs index ccaa1a0d314..c9a26b0069c 100644 --- a/src/Runner.Worker/Container/DockerCommandManager.cs +++ b/src/Runner.Worker/Container/DockerCommandManager.cs @@ -289,8 +289,7 @@ public async Task DockerNetworkCreate(IExecutionContext context, string net #if OS_WINDOWS return await ExecuteDockerCommandAsync(context, "network", $"create --label {DockerInstanceLabel} {network} --driver nat", context.CancellationToken); #else - // TODO: make conditional - //return await ExecuteDockerCommandAsync(context, "network", $"create --label {DockerInstanceLabel} {network}", context.CancellationToken); + return await ExecuteDockerCommandAsync(context, "network", $"create --label {DockerInstanceLabel} {network}", context.CancellationToken); #endif } From 7b0704a99df3305692ff1ad5056dfec2606acc3c Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Thu, 13 Jun 2024 17:58:18 +0000 Subject: [PATCH 03/13] fix --- releaseVersion | 2 +- src/Runner.Worker/ContainerOperationProvider.cs | 7 ++++--- src/runnerversion | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/releaseVersion b/releaseVersion index 6f508d398dc..fb802e1c65c 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.317.0-dfinity +2.317.0-dfinity1 diff --git a/src/Runner.Worker/ContainerOperationProvider.cs b/src/Runner.Worker/ContainerOperationProvider.cs index 63c19c0199a..37bff377a3c 100644 --- a/src/Runner.Worker/ContainerOperationProvider.cs +++ b/src/Runner.Worker/ContainerOperationProvider.cs @@ -108,8 +108,8 @@ public async Task StartContainersAsync(IExecutionContext executionContext, objec container.ContainerNetwork = containerNetwork; await StartContainerAsync(executionContext, container); } - // TODO: conditional logic - //await RunContainersHealthcheck(executionContext, containers); + + await RunContainersHealthcheck(executionContext, containers); } public async Task RunContainersHealthcheck(IExecutionContext executionContext, List containers) @@ -164,8 +164,9 @@ public async Task StopContainersAsync(IExecutionContext executionContext, object { await StopContainerAsync(executionContext, container); } + // TODO: conditional // Remove the container network - await RemoveContainerNetworkAsync(executionContext, containers.First().ContainerNetwork); + //await RemoveContainerNetworkAsync(executionContext, containers.First().ContainerNetwork); } private async Task StartContainerAsync(IExecutionContext executionContext, ContainerInfo container) diff --git a/src/runnerversion b/src/runnerversion index 6f508d398dc..fb802e1c65c 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.317.0-dfinity +2.317.0-dfinity1 From 60cd4da7dcd897d8128e566b46ed1c95e7f7ccf7 Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Wed, 19 Jun 2024 20:53:12 +0000 Subject: [PATCH 04/13] podman --- images/Dockerfile | 26 +++++--------------------- releaseVersion | 2 +- src/runnerversion | 2 +- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/images/Dockerfile b/images/Dockerfile index 17b66b15b86..fcc36998be5 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -1,5 +1,5 @@ # Source: https://github.com/dotnet/dotnet-docker -FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy as build +FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-noble as build ARG TARGETOS ARG TARGETARCH @@ -21,27 +21,16 @@ RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-c && unzip ./runner-container-hooks.zip -d ./k8s \ && rm runner-container-hooks.zip -RUN export RUNNER_ARCH=${TARGETARCH} \ - && if [ "$RUNNER_ARCH" = "amd64" ]; then export DOCKER_ARCH=x86_64 ; fi \ - && if [ "$RUNNER_ARCH" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \ - && curl -fLo docker.tgz https://download.docker.com/${TARGETOS}/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz \ - && tar zxvf docker.tgz \ - && rm -rf docker.tgz \ - && mkdir -p /usr/local/lib/docker/cli-plugins \ - && curl -fLo /usr/local/lib/docker/cli-plugins/docker-buildx \ - "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${TARGETARCH}" \ - && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx - -FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy +FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-noble ENV DEBIAN_FRONTEND=noninteractive ENV RUNNER_MANUALLY_TRAP_SIG=1 ENV ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT=1 -ENV ImageOS=ubuntu22 +ENV ImageOS=ubuntu24 # 'gpg-agent' and 'software-properties-common' are needed for the 'add-apt-repository' command that follows RUN apt update -y \ - && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common \ + && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common podman podman-docker \ && rm -rf /var/lib/apt/lists/* # Configure git-core/ppa based on guidance here: https://git-scm.com/download/linux @@ -49,17 +38,12 @@ RUN add-apt-repository ppa:git-core/ppa \ && apt update -y RUN adduser --disabled-password --gecos "" --uid 1001 runner \ - && groupadd docker --gid 123 \ && usermod -aG sudo runner \ - && usermod -aG docker runner \ && echo "%sudo ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers \ && echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >> /etc/sudoers WORKDIR /home/runner -COPY --chown=runner:docker --from=build /actions-runner . -COPY --from=build /usr/local/lib/docker/cli-plugins/docker-buildx /usr/local/lib/docker/cli-plugins/docker-buildx - -RUN install -o root -g root -m 755 docker/* /usr/bin/ && rm -rf docker +COPY --chown=runner:runner --from=build /actions-runner . USER runner diff --git a/releaseVersion b/releaseVersion index fb802e1c65c..10d796e0336 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.317.0-dfinity1 +2.317.0-podman1 diff --git a/src/runnerversion b/src/runnerversion index fb802e1c65c..10d796e0336 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.317.0-dfinity1 +2.317.0-podman1 From 8171a6c21977c9ddaccfffb2be956284083bc641 Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Thu, 20 Jun 2024 16:51:17 +0000 Subject: [PATCH 05/13] test --- images/Dockerfile | 2 +- releaseVersion | 2 +- src/Runner.Worker/Container/DockerCommandManager.cs | 1 + src/runnerversion | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/images/Dockerfile b/images/Dockerfile index fcc36998be5..5f7d100d714 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -30,7 +30,7 @@ ENV ImageOS=ubuntu24 # 'gpg-agent' and 'software-properties-common' are needed for the 'add-apt-repository' command that follows RUN apt update -y \ - && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common podman podman-docker \ + && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common podman podman-docker uidmap \ && rm -rf /var/lib/apt/lists/* # Configure git-core/ppa based on guidance here: https://git-scm.com/download/linux diff --git a/releaseVersion b/releaseVersion index 10d796e0336..ee34638eaaf 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.317.0-podman1 +2.317.0-podman2 diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs index c9a26b0069c..d6b61446d07 100644 --- a/src/Runner.Worker/Container/DockerCommandManager.cs +++ b/src/Runner.Worker/Container/DockerCommandManager.cs @@ -116,6 +116,7 @@ public async Task DockerCreate(IExecutionContext context, ContainerInfo // TODO: pull opts from env dockerOptions.Add("--privileged"); dockerOptions.Add("--cgroupns host"); + dockerOptions.Add("--userns host"); if (!string.IsNullOrEmpty(container.ContainerWorkDirectory)) { dockerOptions.Add($"--workdir {container.ContainerWorkDirectory}"); diff --git a/src/runnerversion b/src/runnerversion index 10d796e0336..ee34638eaaf 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.317.0-podman1 +2.317.0-podman2 From 3a3f442d9717c38922e2e78cc6d148a33b5c98ca Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Thu, 20 Jun 2024 18:18:09 +0000 Subject: [PATCH 06/13] test2 --- images/Dockerfile | 2 +- releaseVersion | 2 +- src/runnerversion | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/Dockerfile b/images/Dockerfile index 5f7d100d714..fcc36998be5 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -30,7 +30,7 @@ ENV ImageOS=ubuntu24 # 'gpg-agent' and 'software-properties-common' are needed for the 'add-apt-repository' command that follows RUN apt update -y \ - && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common podman podman-docker uidmap \ + && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common podman podman-docker \ && rm -rf /var/lib/apt/lists/* # Configure git-core/ppa based on guidance here: https://git-scm.com/download/linux diff --git a/releaseVersion b/releaseVersion index ee34638eaaf..3d3f3a8d35e 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.317.0-podman2 +2.317.0-podman3 diff --git a/src/runnerversion b/src/runnerversion index ee34638eaaf..3d3f3a8d35e 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.317.0-podman2 +2.317.0-podman3 From 90cd4da8bcf4de5c53ae742bb3b42242221f79cc Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Fri, 21 Jun 2024 15:03:46 +0000 Subject: [PATCH 07/13] keep-id --- images/Dockerfile | 2 +- releaseVersion | 2 +- src/Runner.Worker/Container/DockerCommandManager.cs | 2 +- src/runnerversion | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/Dockerfile b/images/Dockerfile index fcc36998be5..5f7d100d714 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -30,7 +30,7 @@ ENV ImageOS=ubuntu24 # 'gpg-agent' and 'software-properties-common' are needed for the 'add-apt-repository' command that follows RUN apt update -y \ - && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common podman podman-docker \ + && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common podman podman-docker uidmap \ && rm -rf /var/lib/apt/lists/* # Configure git-core/ppa based on guidance here: https://git-scm.com/download/linux diff --git a/releaseVersion b/releaseVersion index 3d3f3a8d35e..343a7e1bfc5 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.317.0-podman3 +2.317.0-podman4 diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs index d6b61446d07..2e21f4bfe8e 100644 --- a/src/Runner.Worker/Container/DockerCommandManager.cs +++ b/src/Runner.Worker/Container/DockerCommandManager.cs @@ -116,7 +116,7 @@ public async Task DockerCreate(IExecutionContext context, ContainerInfo // TODO: pull opts from env dockerOptions.Add("--privileged"); dockerOptions.Add("--cgroupns host"); - dockerOptions.Add("--userns host"); + dockerOptions.Add("--userns keep-id"); if (!string.IsNullOrEmpty(container.ContainerWorkDirectory)) { dockerOptions.Add($"--workdir {container.ContainerWorkDirectory}"); diff --git a/src/runnerversion b/src/runnerversion index 3d3f3a8d35e..343a7e1bfc5 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.317.0-podman3 +2.317.0-podman4 From ac43de9a5f42cfc1a10446fa3198310b5b45abf5 Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Fri, 21 Jun 2024 15:30:23 +0000 Subject: [PATCH 08/13] no userns option --- releaseVersion | 2 +- src/Runner.Worker/Container/DockerCommandManager.cs | 2 +- src/runnerversion | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/releaseVersion b/releaseVersion index 343a7e1bfc5..0e73971b094 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.317.0-podman4 +2.317.0-podman5 diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs index 2e21f4bfe8e..0c3e6bba2f9 100644 --- a/src/Runner.Worker/Container/DockerCommandManager.cs +++ b/src/Runner.Worker/Container/DockerCommandManager.cs @@ -116,7 +116,7 @@ public async Task DockerCreate(IExecutionContext context, ContainerInfo // TODO: pull opts from env dockerOptions.Add("--privileged"); dockerOptions.Add("--cgroupns host"); - dockerOptions.Add("--userns keep-id"); + //dockerOptions.Add("--userns keep-id"); if (!string.IsNullOrEmpty(container.ContainerWorkDirectory)) { dockerOptions.Add($"--workdir {container.ContainerWorkDirectory}"); diff --git a/src/runnerversion b/src/runnerversion index 343a7e1bfc5..0e73971b094 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.317.0-podman4 +2.317.0-podman5 From 1393ba4f8e28616ee2acf179293916ed9a0ca5ad Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Fri, 21 Jun 2024 16:37:24 +0000 Subject: [PATCH 09/13] uidmap --- releaseVersion | 2 +- src/Runner.Worker/Container/DockerCommandManager.cs | 2 ++ src/runnerversion | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/releaseVersion b/releaseVersion index 0e73971b094..8baaf74656b 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.317.0-podman5 +2.317.0-podman6 diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs index 0c3e6bba2f9..99182a67b4f 100644 --- a/src/Runner.Worker/Container/DockerCommandManager.cs +++ b/src/Runner.Worker/Container/DockerCommandManager.cs @@ -116,6 +116,8 @@ public async Task DockerCreate(IExecutionContext context, ContainerInfo // TODO: pull opts from env dockerOptions.Add("--privileged"); dockerOptions.Add("--cgroupns host"); + dockerOptions.Add("--uidmap 1001:0:1"); + dockerOptions.Add("--uidmap 0:1:1001"); //dockerOptions.Add("--userns keep-id"); if (!string.IsNullOrEmpty(container.ContainerWorkDirectory)) { diff --git a/src/runnerversion b/src/runnerversion index 0e73971b094..8baaf74656b 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.317.0-podman5 +2.317.0-podman6 From 2ab8d092be8aae08a4de7778e0267fd5e99b31ec Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Fri, 21 Jun 2024 18:22:08 +0000 Subject: [PATCH 10/13] rootful podman --- images/Dockerfile | 8 +++++++- src/Runner.Worker/Container/DockerCommandManager.cs | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/images/Dockerfile b/images/Dockerfile index 5f7d100d714..00eed686048 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -30,7 +30,7 @@ ENV ImageOS=ubuntu24 # 'gpg-agent' and 'software-properties-common' are needed for the 'add-apt-repository' command that follows RUN apt update -y \ - && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common podman podman-docker uidmap \ + && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common podman \ && rm -rf /var/lib/apt/lists/* # Configure git-core/ppa based on guidance here: https://git-scm.com/download/linux @@ -42,6 +42,12 @@ RUN adduser --disabled-password --gecos "" --uid 1001 runner \ && echo "%sudo ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers \ && echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >> /etc/sudoers +COPY < DockerCreate(IExecutionContext context, ContainerInfo // TODO: pull opts from env dockerOptions.Add("--privileged"); dockerOptions.Add("--cgroupns host"); - dockerOptions.Add("--uidmap 1001:0:1"); - dockerOptions.Add("--uidmap 0:1:1001"); + dockerOptions.Add("-u 1001:1001"); //dockerOptions.Add("--userns keep-id"); if (!string.IsNullOrEmpty(container.ContainerWorkDirectory)) { From 79df555cfcd5caba952ccfa3f6ce202a28c6bd7d Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Fri, 21 Jun 2024 18:23:46 +0000 Subject: [PATCH 11/13] release --- releaseVersion | 2 +- src/runnerversion | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releaseVersion b/releaseVersion index 8baaf74656b..f609dcf0f47 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.317.0-podman6 +2.317.0-podman7 diff --git a/src/runnerversion b/src/runnerversion index 8baaf74656b..f609dcf0f47 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.317.0-podman6 +2.317.0-podman7 From b2846ff33a6020acc1cddfa50b6f05f923bd4522 Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Fri, 21 Jun 2024 18:49:24 +0000 Subject: [PATCH 12/13] escape --- images/Dockerfile | 2 +- releaseVersion | 2 +- src/runnerversion | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/Dockerfile b/images/Dockerfile index 00eed686048..14dd987f40c 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -44,7 +44,7 @@ RUN adduser --disabled-password --gecos "" --uid 1001 runner \ COPY < Date: Fri, 21 Jun 2024 18:58:59 +0000 Subject: [PATCH 13/13] misc --- images/Dockerfile | 2 +- releaseVersion | 2 +- src/runnerversion | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/Dockerfile b/images/Dockerfile index 14dd987f40c..6d8af59a953 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -44,7 +44,7 @@ RUN adduser --disabled-password --gecos "" --uid 1001 runner \ COPY <