diff --git a/driver/Dockerfile.hail b/driver/Dockerfile.hail index 7f9a7c82..91117ae6 100644 --- a/driver/Dockerfile.hail +++ b/driver/Dockerfile.hail @@ -3,7 +3,7 @@ FROM australia-southeast1-docker.pkg.dev/analysis-runner/images/driver-base:1.5 ARG HAIL_SHA -ENV HAIL_QUERY_BACKEND service +ENV HAIL_QUERY_BACKEND=service RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ @@ -40,7 +40,7 @@ RUN apt-get update && \ pip --no-cache-dir install \ analysis-runner \ bokeh \ - cloudpathlib[all] \ + 'cloudpathlib[all]' \ cpg-utils \ cpg-workflows \ gcsfs \ @@ -48,5 +48,7 @@ RUN apt-get update && \ pyarrow \ sample-metadata \ metamist \ - selenium>=3.8.0 \ - statsmodels + 'selenium>=3.8.0' \ + statsmodels && \ + # Delete maven/pip/etc caches and /tmp scripts used only during the build + rm -rf /root/.cache /tmp/tmp* diff --git a/server/ar.py b/server/ar.py index 23dd66eb..4e2c5b74 100644 --- a/server/ar.py +++ b/server/ar.py @@ -289,7 +289,7 @@ def prepare_job_from_config( job.storage(job_config.storage) if job_config.memory: job.memory(job_config.memory) - job._preemptible = job_config.preemptible # noqa: SLF001 + job.spot(job_config.preemptible) if job_config.environment_variables: add_environment_variables(job, job_config.environment_variables)