Update podman devcontainer file (#166)

* Update podman devcontainer file * chore: auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Test fixture updates * chore: auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Test fixture updates --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
ansible · May 2, 2024 · 7ec5560 · 7ec5560
1 parent 53e2882
commit 7ec5560
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 24 deletions.
diff --git a/src/ansible_creator/resources/common/devcontainer/.devcontainer/podman/devcontainer.json.j2 b/src/ansible_creator/resources/common/devcontainer/.devcontainer/podman/devcontainer.json.j2
@@ -1,22 +1,23 @@
 {
   "name": "ansible-dev-container-podman",
   "image": "{{ DEV_CONTAINER_IMAGE }}",
-  "containerUser": "podman",
+  "containerUser": "root",
   "runArgs": [
-    "--security-opt",
-    "seccomp=unconfined",
-    "--security-opt",
-    "label=disable",
     "--cap-add=SYS_ADMIN",
     "--cap-add=SYS_RESOURCE",
     "--device",
     "/dev/fuse",
     "--security-opt",
+    "seccomp=unconfined",
+    "--security-opt",
+    "label=disable",
+    "--security-opt",
     "apparmor=unconfined",
-    "--userns=keep-id:uid=1000,gid=1000",
-    "--hostname=ansible-dev-container"
+    "--userns=host",
+    "--hostname=ansible-dev-container",
+    "--volume",
+    "ansible-dev-tools-container-storage:/var/lib/containers"
   ],
-  "updateRemoteUserUID": true,
   "customizations": {
     "vscode": {
       "extensions": ["redhat.ansible"]

diff --git a/tests/fixtures/collection/testorg/testcol/.devcontainer/podman/devcontainer.json b/tests/fixtures/collection/testorg/testcol/.devcontainer/podman/devcontainer.json
@@ -1,22 +1,23 @@
 {
   "name": "ansible-dev-container-podman",
   "image": "ghcr.io/ansible/community-ansible-dev-tools:latest",
-  "containerUser": "podman",
+  "containerUser": "root",
   "runArgs": [
-    "--security-opt",
-    "seccomp=unconfined",
-    "--security-opt",
-    "label=disable",
     "--cap-add=SYS_ADMIN",
     "--cap-add=SYS_RESOURCE",
     "--device",
     "/dev/fuse",
     "--security-opt",
+    "seccomp=unconfined",
+    "--security-opt",
+    "label=disable",
+    "--security-opt",
     "apparmor=unconfined",
-    "--userns=keep-id:uid=1000,gid=1000",
-    "--hostname=ansible-dev-container"
+    "--userns=host",
+    "--hostname=ansible-dev-container",
+    "--volume",
+    "ansible-dev-tools-container-storage:/var/lib/containers"
   ],
-  "updateRemoteUserUID": true,
   "customizations": {
     "vscode": {
       "extensions": ["redhat.ansible"]

diff --git a/tests/fixtures/project/ansible_project/.devcontainer/podman/devcontainer.json b/tests/fixtures/project/ansible_project/.devcontainer/podman/devcontainer.json
@@ -1,22 +1,23 @@
 {
   "name": "ansible-dev-container-podman",
   "image": "ghcr.io/ansible/community-ansible-dev-tools:latest",
-  "containerUser": "podman",
+  "containerUser": "root",
   "runArgs": [
-    "--security-opt",
-    "seccomp=unconfined",
-    "--security-opt",
-    "label=disable",
     "--cap-add=SYS_ADMIN",
     "--cap-add=SYS_RESOURCE",
     "--device",
     "/dev/fuse",
     "--security-opt",
+    "seccomp=unconfined",
+    "--security-opt",
+    "label=disable",
+    "--security-opt",
     "apparmor=unconfined",
-    "--userns=keep-id:uid=1000,gid=1000",
-    "--hostname=ansible-dev-container"
+    "--userns=host",
+    "--hostname=ansible-dev-container",
+    "--volume",
+    "ansible-dev-tools-container-storage:/var/lib/containers"
   ],
-  "updateRemoteUserUID": true,
   "customizations": {
     "vscode": {
       "extensions": ["redhat.ansible"]