simplify rocky build

Signed-off-by: vsoch <[email protected]>

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, [email protected], [email protected], [email protected]]' \
-#&&   echo '  specs: [flux-sched, flux-core, [email protected]]' \
+&&   echo '  specs: [flux-sched, flux-core, [email protected]]' \
 &&   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

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