@@ -149,10 +149,9 @@ def _setup_container(self, docker_image):
149
149
docker = subprocess .Popen (docker_args )
150
150
docker .wait ()
151
151
152
- def _create_container (self , docker_image , local_portage , overlays ):
152
+ def _create_container (self , docker_image , portdir , overlays ):
153
153
"""Create new container."""
154
154
155
-
156
155
cache_dir = user_cache_dir ("ebuildtester" )
157
156
os .makedirs (cache_dir , exist_ok = True )
158
157
@@ -162,6 +161,11 @@ def _create_container(self, docker_image, local_portage, overlays):
162
161
pkgdir = "{}/packages" .format (cache_dir )
163
162
os .makedirs (pkgdir , exist_ok = True )
164
163
164
+ if options .OPTIONS .batch :
165
+ portdir_opt = "ro"
166
+ else :
167
+ portdir_opt = "rw"
168
+
165
169
docker_args = options .OPTIONS .docker_command \
166
170
+ ["create" ,
167
171
"--tty" ,
@@ -172,9 +176,9 @@ def _create_container(self, docker_image, local_portage, overlays):
172
176
"--security-opt" , "apparmor:unconfined" ,
173
177
"--device" , "/dev/fuse" ,
174
178
"--workdir" , "/root" ,
175
- "--volume" , "%s :/var/db/repos/gentoo" % local_portage ,
176
- "--volume" , "%s :/var/cache/distfiles" % distdir ,
177
- "--volume" , "%s :/var/cache/binpkgs" % pkgdir ]
179
+ "--volume" , f" { portdir } :/var/db/repos/gentoo: { portdir_opt } " ,
180
+ "--volume" , f" { distdir } :/var/cache/distfiles" ,
181
+ "--volume" , f" { pkgdir } :/var/cache/binpkgs" ]
178
182
179
183
if options .OPTIONS .storage_opt :
180
184
for s in options .OPTIONS .storage_opt :
0 commit comments