From f8ed29223809f1f6fe1123fe6df38a33884e047d Mon Sep 17 00:00:00 2001 From: Darrenn Jackson Date: Mon, 1 Dec 2025 16:43:15 -0600 Subject: [PATCH 1/3] Add podman userns option and id mappings Signed-off-by: Darrenn Jackson --- topics/using-docker-images.dita | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/topics/using-docker-images.dita b/topics/using-docker-images.dita index 0f0c8dd96..38bf0b669 100644 --- a/topics/using-docker-images.dita +++ b/topics/using-docker-images.dita @@ -31,10 +31,16 @@

When a container is stopped, any changes made within the container are lost, so source files and generated output should be stored outside the container. These resources are attached to the container by mounting directories from the host machine.

- If you use - Podman to manage and run your containers, - you can substitute podman for the docker command in the instructions - below. + If you use Podman to manage and run your containers, you must substitute + podman + --userns=keep-id:uid=UID,gid=GID for the + docker command in the instructions below. For DITA-OT versions 4.2.3 + and earlier, both UID and GID are + 1000. For all later DITA-OT versions, both values are + 1001.

To run the DITA-OT image, you will need to install Docker and be able to access the GitHub Container Registry. From a6bc7bd96bd390c25b08ebcc52829a65838dea07 Mon Sep 17 00:00:00 2001 From: Darrenn Jackson Date: Mon, 1 Dec 2025 17:30:46 -0600 Subject: [PATCH 2/3] use xpr file to prettify change Signed-off-by: Darrenn Jackson --- topics/using-docker-images.dita | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/topics/using-docker-images.dita b/topics/using-docker-images.dita index 38bf0b669..ba7629106 100644 --- a/topics/using-docker-images.dita +++ b/topics/using-docker-images.dita @@ -31,16 +31,14 @@

When a container is stopped, any changes made within the container are lost, so source files and generated output should be stored outside the container. These resources are attached to the container by mounting directories from the host machine.

- If you use Podman to manage and run your containers, If you use + Podman to manage and run your containers, + you must substitute - podman - --userns=keep-id:uid=UID,gid=GID for the - docker command in the instructions below. For DITA-OT versions 4.2.3 - and earlier, both UID and GID are - 1000. For all later DITA-OT versions, both values are - 1001. + podman --userns=keep-id:uid=UID,gid=GID for the + docker command in the instructions below. For DITA-OT versions 4.2.3 and earlier, both + UID and GID are 1000. For all later DITA-OT + versions, both values are 1001.

To run the DITA-OT image, you will need to install Docker and be able to access the GitHub Container Registry. From bb3e971cd9d77440fab5533b97b36ea9ec1a3932 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 7 Dec 2025 23:30:12 +0100 Subject: [PATCH 3/3] Run Prettier to fix failing formatting check Signed-off-by: Roger Sheen --- topics/using-docker-images.dita | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/topics/using-docker-images.dita b/topics/using-docker-images.dita index ba7629106..26462bf9e 100644 --- a/topics/using-docker-images.dita +++ b/topics/using-docker-images.dita @@ -33,8 +33,11 @@ directories from the host machine.

If you use Podman to manage and run your containers, - you must substitute + you must substitute podman --userns=keep-id:uid=UID,gid=GID for the docker command in the instructions below. For DITA-OT versions 4.2.3 and earlier, both UID and GID are 1000. For all later DITA-OT