Thread Julia options through configuration file

google · Jul 17, 2020 · a091696 · a091696
1 parent 23632d7
commit a091696
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/caliban/cli.py b/caliban/cli.py
@@ -555,6 +555,7 @@ def generate_docker_args(job_mode: conf.JobMode,
   docker_args = {
       "extra_dirs": args.get("dir"),
       "requirements_path": reqs if os.path.exists(reqs) else None,
+      "julia_url": conf.caliban_config().get("julia_url", None),
       "conda_env_path": conda_env if os.path.exists(conda_env) else None,
       "caliban_config": conf.caliban_config(),
       "credentials_path": creds_path,

diff --git a/caliban/config/__init__.py b/caliban/config/__init__.py
@@ -130,7 +130,8 @@ def expand_image(image: str) -> str:
     s.Optional("project_id"): s.And(str, len),
     s.Optional("cloud_key"): s.And(str, len),
     s.Optional("base_image", default=None): BaseImage,
-    s.Optional("apt_packages", default=AptPackages.validate({})): AptPackages
+    s.Optional("apt_packages", default=AptPackages.validate({})): AptPackages,
+    s.Optional("julia_url", default=None): str
 })
 
 # Accessors

diff --git a/caliban/docker/build.py b/caliban/docker/build.py
@@ -22,6 +22,7 @@
 
 import json
 import os
+import os.path
 import subprocess
 from enum import Enum
 from pathlib import Path
@@ -247,17 +248,18 @@ def _dependency_entries(workdir: str,
 RUN /bin/bash -c "pip install --no-cache-dir -r {requirements_path}"
 """
 
-  julia_url = "https://julialang-s3.julialang.org/bin/linux/x64/1.5/julia-1.5.0-rc1-linux-x86_64.tar.gz"
   if julia_url is not None:
-    # e.g. "https://julialang-s3.julialang.org/bin/linux/x64/1.5/julia-1.5.0-rc1-linux-x86_64.tar.gz"
-    ret += f"""
+    if os.path.exists("Project.toml"):
+      ret += f"""
 COPY --chown={user_id}:{user_group} *.toml {workdir}/
+"""
+    # TODO: Use /usr/local instead of /tmp for Julia directories
+    ret += f"""
 COPY --chown={user_id}:{user_group} src {workdir}/src
-# TODO: Use /usr/local instead of /tmp
-ENV JULIA_LOC /tmp/julia
-ENV JULIA_DEPOT_PATH /tmp/var/julia_depot
-ENV JULIA_PROJECT {workdir}
-ENV PATH $PATH:$JULIA_LOC/bin
+ENV JULIA_LOC=/tmp/julia
+ENV JULIA_DEPOT_PATH=/tmp/var/julia_depot
+ENV JULIA_PROJECT={workdir}
+ENV PATH=$PATH:$JULIA_LOC/bin
 RUN /bin/bash -c "mkdir -p $JULIA_LOC && \
                   wget -nv {julia_url} && \
                   tar xzf $(basename {julia_url}) -C $JULIA_LOC --strip-components 1 && \