Skip to content

Commit 03c5039

Browse files
committed
fix(e2e): enable guest podman driver mounts
Signed-off-by: Evan Lezar <[email protected]>
1 parent 68afc72 commit 03c5039

2 files changed

Lines changed: 19 additions & 0 deletions

File tree

‎e2e/run.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,7 @@ PY
749749
export CONTAINER_HOST="unix://\${OPENSHELL_PODMAN_SOCKET}"
750750
export OPENSHELL_E2E_CONTAINER_ENGINE_UNSET_XDG_CONFIG_HOME=1
751751
insert_podman_config_key socket_path "\$(toml_string "\${OPENSHELL_PODMAN_SOCKET}")"
752+
insert_podman_config_key enable_bind_mounts true
752753
753754
provider_spiffe_port=\$(pick_free_port)
754755
export OPENSHELL_E2E_GATEWAY_SPIFFE_SOCKET="\${spiffe_root}/gateway.sock"

‎nix/test-guest/configuration/podman-rootless.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,30 @@
2626
- name: Install Ubuntu rootless Podman
2727
ansible.builtin.apt:
2828
name:
29+
- apparmor
2930
- fuse-overlayfs
3031
- passt
3132
- podman
3233
- uidmap
3334
state: present
3435

36+
- name: Allow pasta to receive Podman stop signals
37+
ansible.builtin.lineinfile:
38+
path: /etc/apparmor.d/usr.bin.pasta
39+
insertafter: "^ include <abstractions/pasta>$"
40+
line: " signal (receive) peer=podman,"
41+
state: present
42+
register: pasta_apparmor_profile
43+
44+
- name: Reload pasta AppArmor profile
45+
ansible.builtin.command:
46+
argv:
47+
- apparmor_parser
48+
- --replace
49+
- /etc/apparmor.d/usr.bin.pasta
50+
when: pasta_apparmor_profile.changed
51+
changed_when: pasta_apparmor_profile.changed
52+
3553
- name: Enable the rootless Podman API socket
3654
ansible.builtin.systemd_service:
3755
name: podman.socket

0 commit comments

Comments
 (0)