keep-id

dfinity · Jun 21, 2024 · 90cd4da · 90cd4da
1 parent 3a3f442
commit 90cd4da
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -116,7 +116,7 @@ public async Task<string> 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
@@ -1 +1 @@
-2.317.0-podman3
+2.317.0-podman4