Skip to content

Commit 2023629

Browse files
authored
Fix podman devcontainer (#401)
* DNM * Update * Update
1 parent c12cdc8 commit 2023629

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

src/ansible_creator/resources/common/devcontainer/.devcontainer/podman/devcontainer.json.j2

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"image": "{{ dev_container_image }}",
44
"containerUser": "root",
55
"runArgs": [
6+
"--cap-add=CAP_MKNOD",
7+
"--cap-add=NET_ADMIN",
68
"--cap-add=SYS_ADMIN",
79
"--cap-add=SYS_RESOURCE",
810
"--device",
@@ -13,10 +15,10 @@
1315
"label=disable",
1416
"--security-opt",
1517
"apparmor=unconfined",
18+
"--security-opt",
19+
"unmask=/sys/fs/cgroup",
1620
"--userns=host",
17-
"--hostname=ansible-dev-container",
18-
"--volume",
19-
"ansible-dev-tools-container-storage:/var/lib/containers"
21+
"--hostname=ansible-dev-container"
2022
],
2123
"customizations": {
2224
"vscode": {

tests/fixtures/collection/testorg/testcol/.devcontainer/podman/devcontainer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"image": "ghcr.io/ansible/community-ansible-dev-tools:latest",
44
"containerUser": "root",
55
"runArgs": [
6+
"--cap-add=CAP_MKNOD",
7+
"--cap-add=NET_ADMIN",
68
"--cap-add=SYS_ADMIN",
79
"--cap-add=SYS_RESOURCE",
810
"--device",
@@ -13,10 +15,10 @@
1315
"label=disable",
1416
"--security-opt",
1517
"apparmor=unconfined",
18+
"--security-opt",
19+
"unmask=/sys/fs/cgroup",
1620
"--userns=host",
17-
"--hostname=ansible-dev-container",
18-
"--volume",
19-
"ansible-dev-tools-container-storage:/var/lib/containers"
21+
"--hostname=ansible-dev-container"
2022
],
2123
"customizations": {
2224
"vscode": {

tests/fixtures/project/playbook_project/.devcontainer/podman/devcontainer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"image": "ghcr.io/ansible/community-ansible-dev-tools:latest",
44
"containerUser": "root",
55
"runArgs": [
6+
"--cap-add=CAP_MKNOD",
7+
"--cap-add=NET_ADMIN",
68
"--cap-add=SYS_ADMIN",
79
"--cap-add=SYS_RESOURCE",
810
"--device",
@@ -13,10 +15,10 @@
1315
"label=disable",
1416
"--security-opt",
1517
"apparmor=unconfined",
18+
"--security-opt",
19+
"unmask=/sys/fs/cgroup",
1620
"--userns=host",
17-
"--hostname=ansible-dev-container",
18-
"--volume",
19-
"ansible-dev-tools-container-storage:/var/lib/containers"
21+
"--hostname=ansible-dev-container"
2022
],
2123
"customizations": {
2224
"vscode": {

0 commit comments

Comments
 (0)