Skip to content

Commit 1f09a3e

Browse files
authored
Merge pull request #2416 from GNS3/bugfix/2414
Run Docker containers with user namespaces enabled
2 parents 8429494 + 22f022c commit 1f09a3e

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

gns3server/compute/docker/docker_vm.py

+1
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ async def create(self):
384384
"Privileged": True,
385385
"Binds": self._mount_binds(image_infos),
386386
},
387+
"UsernsMode": "host",
387388
"Volumes": {},
388389
"Env": ["container=docker"], # Systemd compliant: https://github.com/GNS3/gns3-server/issues/573
389390
"Cmd": [],

tests/compute/docker/test_docker_vm.py

+15
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ async def test_create(compute_project, manager):
109109
],
110110
"Privileged": True
111111
},
112+
"UsernsMode": "host",
112113
"Volumes": {},
113114
"NetworkDisabled": True,
114115
"Hostname": "test",
@@ -147,6 +148,7 @@ async def test_create_with_tag(compute_project, manager):
147148
],
148149
"Privileged": True
149150
},
151+
"UsernsMode": "host",
150152
"Volumes": {},
151153
"NetworkDisabled": True,
152154
"Hostname": "test",
@@ -189,6 +191,7 @@ async def test_create_vnc(compute_project, manager):
189191
],
190192
"Privileged": True
191193
},
194+
"UsernsMode": "host",
192195
"Volumes": {},
193196
"NetworkDisabled": True,
194197
"Hostname": "test",
@@ -318,6 +321,7 @@ async def test_create_start_cmd(compute_project, manager):
318321
],
319322
"Privileged": True
320323
},
324+
"UsernsMode": "host",
321325
"Volumes": {},
322326
"Entrypoint": ["/gns3/init.sh"],
323327
"Cmd": ["/bin/ls"],
@@ -416,6 +420,7 @@ async def information():
416420
],
417421
"Privileged": True
418422
},
423+
"UsernsMode": "host",
419424
"Volumes": {},
420425
"NetworkDisabled": True,
421426
"Hostname": "test",
@@ -459,6 +464,7 @@ async def test_create_with_user(compute_project, manager):
459464
],
460465
"Privileged": True
461466
},
467+
"UsernsMode": "host",
462468
"Volumes": {},
463469
"NetworkDisabled": True,
464470
"Hostname": "test",
@@ -542,6 +548,7 @@ async def test_create_with_extra_volumes_duplicate_1_image(compute_project, mana
542548
],
543549
"Privileged": True
544550
},
551+
"UsernsMode": "host",
545552
"Volumes": {},
546553
"NetworkDisabled": True,
547554
"Hostname": "test",
@@ -581,6 +588,7 @@ async def test_create_with_extra_volumes_duplicate_2_user(compute_project, manag
581588
],
582589
"Privileged": True
583590
},
591+
"UsernsMode": "host",
584592
"Volumes": {},
585593
"NetworkDisabled": True,
586594
"Hostname": "test",
@@ -620,6 +628,7 @@ async def test_create_with_extra_volumes_duplicate_3_subdir(compute_project, man
620628
],
621629
"Privileged": True
622630
},
631+
"UsernsMode": "host",
623632
"Volumes": {},
624633
"NetworkDisabled": True,
625634
"Hostname": "test",
@@ -659,6 +668,7 @@ async def test_create_with_extra_volumes_duplicate_4_backslash(compute_project,
659668
],
660669
"Privileged": True
661670
},
671+
"UsernsMode": "host",
662672
"Volumes": {},
663673
"NetworkDisabled": True,
664674
"Hostname": "test",
@@ -697,6 +707,7 @@ async def test_create_with_extra_volumes_duplicate_5_subdir_issue_1595(compute_p
697707
],
698708
"Privileged": True
699709
},
710+
"UsernsMode": "host",
700711
"Volumes": {},
701712
"NetworkDisabled": True,
702713
"Hostname": "test",
@@ -735,6 +746,7 @@ async def test_create_with_extra_volumes_duplicate_6_subdir_issue_1595(compute_p
735746
],
736747
"Privileged": True
737748
},
749+
"UsernsMode": "host",
738750
"Volumes": {},
739751
"NetworkDisabled": True,
740752
"Hostname": "test",
@@ -781,6 +793,7 @@ async def test_create_with_extra_volumes(compute_project, manager):
781793
],
782794
"Privileged": True
783795
},
796+
"UsernsMode": "host",
784797
"Volumes": {},
785798
"NetworkDisabled": True,
786799
"Hostname": "test",
@@ -1029,6 +1042,7 @@ async def test_update(vm):
10291042
],
10301043
"Privileged": True
10311044
},
1045+
"UsernsMode": "host",
10321046
"Volumes": {},
10331047
"NetworkDisabled": True,
10341048
"Hostname": "test",
@@ -1097,6 +1111,7 @@ async def test_update_running(vm):
10971111
],
10981112
"Privileged": True
10991113
},
1114+
"UsernsMode": "host",
11001115
"Volumes": {},
11011116
"NetworkDisabled": True,
11021117
"Hostname": "test",

0 commit comments

Comments
 (0)