Skip to content

Prevent race conditions when downloading NodeJS #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GlassOfWhiskey wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −9
Open

Prevent race conditions when downloading NodeJS #424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions src/cwl_utils/sandboxjs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,16 +367,25 @@ def new_js_proc(
if force_docker_pull:
nodejs_pull_commands.append("--force")
nodejs_pull_commands.append(nodeimg)
cwd = singularity_cache or Path.cwd()
nodejsimg = subprocess.check_output( # nosec
nodejs_pull_commands, text=True, cwd=str(cwd)
)
_logger.debug(
"Pulled Docker image %s %s using %s",
nodeimg,
nodejsimg,
container_engine,
cwd = (
Path(singularity_cache) if singularity_cache else Path.cwd()
)
try:
nodejsimg = subprocess.check_output( # nosec
nodejs_pull_commands, text=True, cwd=str(cwd)
)
_logger.debug(
"Pulled Docker image %s %s using %s",
nodeimg,
nodejsimg,
container_engine,
)
except (subprocess.CalledProcessError, OSError) as err:
if not (
need_singularity
and glob.glob(str(cwd / "node_alpine.sif"))
):
raise err
self.have_node_slim = True
nodejs_commands = [container_engine]
if (
Expand Down