TEST again

docker/ubuntu

@@ -11,15 +11,6 @@ set -o noclobber \
 &&   echo '  - vim' \
 &&   echo '  - emacs' \
 &&   echo '  - wget' \
-&&   echo '  - py-numpy@1.25' \
-&&   echo '  - py-pyaml' \
-&&   echo '  - py-pandas~performance' \
-&&   echo '  - py-matplotlib' \
-&&   echo '  - mesa~llvm' \
-&&   echo '  - vtk~opengl2~mpi+python' \
-&&   echo '  - py-h5py' \
-&&   echo '  - exaca@master' \
-&&   echo '  - additivefoam@main' \
 &&   echo '  concretizer:' \
 &&   echo '    unify: true' \
 &&   echo '  config:' \
@@ -41,10 +32,24 @@ RUN cd /opt/spack-environment && \
     spack env activate --sh -d . > activate.sh
 
 
+# Bare OS image to run the installed executables
+FROM ubuntu:22.04
+
+COPY --from=builder /opt/spack-environment /opt/spack-environment
+COPY --from=builder /opt/software /opt/software
+COPY --from=builder /opt/myna /opt/myna
+COPY --from=builder /opt/3DThesis /opt/3DThesis
+ENV PATH="/opt/3DThesis/bin:$PATH"
+
+# paths.view is a symlink, so copy the parent to avoid dereferencing and duplicating it
+COPY --from=builder /opt/views /opt/views
+
+
 # This section should eventually be moved into spack installs
 # Install 3DThesis
 ENV THESIS_DIR=/opt/3DThesis
-RUN THESIS_VERSION=master.tar.gz && \
+RUN . /opt/spack-environment/activate.sh && \
+    THESIS_VERSION=master.tar.gz && \
     THESIS_ARCHIVE=3DThesis-${THESIS_VERSION} && \
     THESIS_URL=https://github.com/ORNL-MDF/3DThesis/archive/refs/heads/${THESIS_VERSION} && \
     wget --quiet ${THESIS_URL} --output-document=${THESIS_ARCHIVE} && \
@@ -59,27 +64,15 @@ RUN THESIS_VERSION=master.tar.gz && \
 
 # Get Myna
 ENV MYNA_DIR=/opt/myna
-RUN MYNA_VERSION=main.tar.gz && \
+RUN . /opt/spack-environment/activate.sh && \
+    MYNA_VERSION=main.tar.gz && \
     MYNA_ARCHIVE=myna-${MYNA_VERSION} && \
     MYNA_URL=https://github.com/ORNL-MDF/Myna/archive/refs/heads/${MYNA_VERSION} && \
     wget --quiet ${MYNA_URL} --output-document=${MYNA_ARCHIVE} && \
     mkdir -p ${MYNA_DIR} && \
     tar -xf ${MYNA_ARCHIVE} -C ${MYNA_DIR} --strip-components=1
 
 
-# Bare OS image to run the installed executables
-FROM ubuntu:22.04
-
-COPY --from=builder /opt/spack-environment /opt/spack-environment
-COPY --from=builder /opt/software /opt/software
-COPY --from=builder /opt/myna /opt/myna
-COPY --from=builder /opt/3DThesis /opt/3DThesis
-ENV PATH="/opt/3DThesis/bin:$PATH"
-
-
-# paths.view is a symlink, so copy the parent to avoid dereferencing and duplicating it
-COPY --from=builder /opt/views /opt/views
-
 RUN { \
       echo '#!/bin/sh' \
       && echo '.' /opt/spack-environment/activate.sh \