From 18680518e53cb7ed88eb98824d197056bb746f88 Mon Sep 17 00:00:00 2001 From: Ward K Harold Date: Wed, 7 Aug 2024 18:36:24 +0000 Subject: [PATCH] Drop arguments sections for 1.1.x compatibility. Lose unnecessary JULIA_DEPOT_PATH element --- Apptainer.def | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Apptainer.def b/Apptainer.def index 93f11734..d8fb819f 100644 --- a/Apptainer.def +++ b/Apptainer.def @@ -1,20 +1,12 @@ # Build an Apptainer SIF file containing a working copy of PySR and its prereqs Bootstrap: docker -From: julia:{{ JULIA_VERSION }}-{{ JULIA_BASE_IMAGE }} +From: julia:1.10.4-bullseye Stage: jl -%arguments - JULIA_VERSION=1.10.4 - JULIA_BASE_IMAGE=bullseye - Bootstrap: docker -From: python:{{ PYTHON_VERSION }}-{{ BASE_IMAGE }} +From: python:3.12-bullseye Stage: runtime -%arguments - PYTHON_VERSION=3.12 - BASE_IMAGE=bullseye - %environment # Use the container Julia binary export PATH="/usr/local/julia/bin:$PATH" @@ -49,7 +41,7 @@ Stage: runtime mkdir /pysr/depot mkdir /pysr/env - export JULIA_DEPOT_PATH="/pysr/depot:$JULIA_DEPOT_PATH" + export JULIA_DEPOT_PATH="/pysr/depot" export PYTHON_JULIAPKG_PROJECT="/pysr/env" # Pull in all the Julia dependencies