@@ -21,17 +21,11 @@ def udocker(tmp_path_factory: TempPathFactory) -> str:
21
21
docker_install_dir = str (tmp_path_factory .mktemp ("udocker" ))
22
22
with working_directory (docker_install_dir ):
23
23
24
- url = "https://raw.githubusercontent. com/jorge-lip /udocker-builds/master/tarballs/ udocker-1.1.4 .tar.gz"
24
+ url = "https://github. com/indigo-dc /udocker/releases/download/v1.3.1/ udocker-1.3.1 .tar.gz"
25
25
install_cmds = [
26
- ["curl" , url , "-o" , "./udocker-tarball.tgz" ],
27
- ["tar" , "xzvf" , "udocker-tarball.tgz" , "udocker" ],
28
- [
29
- "bash" ,
30
- "-c" ,
31
- "UDOCKER_TARBALL={}/udocker-tarball.tgz ./udocker install" .format (
32
- docker_install_dir
33
- ),
34
- ],
26
+ ["curl" , "-L" , url , "-o" , "./udocker-tarball.tgz" ],
27
+ ["tar" , "xzvf" , "udocker-tarball.tgz" ],
28
+ ["./udocker/udocker" , "install" ],
35
29
]
36
30
37
31
test_environ ["UDOCKER_DIR" ] = os .path .join (docker_install_dir , ".udocker" )
@@ -42,11 +36,11 @@ def udocker(tmp_path_factory: TempPathFactory) -> str:
42
36
results = [subprocess .call (cmds , env = test_environ ) for cmds in install_cmds ]
43
37
if sum (results ) == 0 :
44
38
break
45
- subprocess .call (["rm" , "./udocker" ])
39
+ subprocess .call (["rm" , "-Rf" , " ./udocker" ])
46
40
47
41
assert sum (results ) == 0
48
42
49
- udocker_path = os .path .join (docker_install_dir , "udocker" )
43
+ udocker_path = os .path .join (docker_install_dir , "udocker/udocker " )
50
44
51
45
return udocker_path
52
46
0 commit comments