From 2f50aa39a3cf068d748601fb698e600353f31648 Mon Sep 17 00:00:00 2001 From: vsoch Date: Wed, 17 Jul 2024 23:43:32 -0600 Subject: [PATCH] simplify rocky build Signed-off-by: vsoch --- rocky/Dockerfile | 5 ++--- ubuntu/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rocky/Dockerfile b/rocky/Dockerfile index b99be0c..bcf07f6 100644 --- a/rocky/Dockerfile +++ b/rocky/Dockerfile @@ -8,8 +8,7 @@ RUN dnf update -y && dnf install -y gettext # Specify flux deps in the spack manifest file (spack.yaml) RUN mkdir /opt/spack-environment \ && (echo spack: \ -&& echo ' specs: [flux-sched, flux-core, pmix@4.2.2, flux-pmix@0.4.0, libzmq@4.3.4]' \ -#&& echo ' specs: [flux-sched, flux-core, libzmq@4.3.4]' \ +&& echo ' specs: [flux-sched, flux-core, libzmq@4.3.4]' \ && echo ' view: /opt/views/view' \ && echo ' concretizer:' \ && echo ' unify: true' \ @@ -38,7 +37,7 @@ RUN find -L /opt/views/view/* -type f -exec readlink -f '{}' \; | \ # Modifications to the environment that are necessary to run RUN cd /opt/spack-environment && \ spack env activate --sh -d . > activate.sh && \ - ./activate.sh && \ + . /activate.sh && \ python3 -m ensurepip # Bare OS image to run the installed executables diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index 9b25c08..b348eae 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -38,7 +38,7 @@ RUN find -L /opt/views/view/* -type f -exec readlink -f '{}' \; | \ # Modifications to the environment that are necessary to run RUN cd /opt/spack-environment && \ spack env activate --sh -d . > activate.sh && \ - ./activate.sh && \ + . ./activate.sh && \ python3 -m ensurepip # Bare OS image to run the installed executables