Skip to content

Commit 1f7fa20

Browse files
authored
Merge pull request #229 from stkw0/podman
fix podman error when binding a volume from an unexisting directory
2 parents 1408874 + 4b6f3b0 commit 1f7fa20

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

.github/workflows/functional.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,16 @@ jobs:
4343
- name: Testbuild of `nano`
4444
run: |
4545
ebuildtester --portage-dir ~/gentoo \
46+
--batch \
47+
--rm \
48+
--pull \
49+
--atom app-editors/nano
50+
ebuildtester --portage-dir ~/gentoo \
51+
--docker-command podman \
52+
--docker-image docker.io/gentoo/stage3 \
53+
--batch \
4654
--rm \
4755
--pull \
48-
--ccache /var/tmp/ccache \
4956
--atom app-editors/nano
5057
5158
- name: Test whether any container is still running

ebuildtester/docker.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,12 @@ def _setup_container(self, docker_image):
151151
def _create_container(self, docker_image, local_portage, overlays):
152152
"""Create new container."""
153153

154+
distdir = "{}/distfiles".format(local_portage)
155+
os.makedirs(distdir, exist_ok=True)
156+
157+
pkgdir = "{}/packages".format(local_portage)
158+
os.makedirs(pkgdir, exist_ok=True)
159+
154160
docker_args = options.OPTIONS.docker_command \
155161
+ ["create",
156162
"--tty",
@@ -162,8 +168,8 @@ def _create_container(self, docker_image, local_portage, overlays):
162168
"--device", "/dev/fuse",
163169
"--workdir", "/root",
164170
"--volume", "%s:/var/db/repos/gentoo" % local_portage,
165-
"--volume", "%s/distfiles:/var/cache/distfiles" % local_portage,
166-
"--volume", "%s/packages:/var/cache/binpkgs" % local_portage]
171+
"--volume", "%s:/var/cache/distfiles" % distdir,
172+
"--volume", "%s:/var/cache/binpkgs" % pkgdir]
167173

168174
if options.OPTIONS.storage_opt:
169175
for s in options.OPTIONS.storage_opt:

0 commit comments

Comments
 (0)