From 3705e8d9e37cf58010999636afd9158163d78ede Mon Sep 17 00:00:00 2001
From: vsoch <vsoch@users.noreply.github.com>
Date: Fri, 3 Mar 2023 22:34:02 -0700
Subject: [PATCH 1/2] spack base giving errors

for lammps. best to remove it and simplify

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
---
 osu-microbench/Dockerfile    | 17 +++++++----------
 osu-microbench/README.md     |  3 +--
 osu-microbench/entrypoint.sh |  2 --
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/osu-microbench/Dockerfile b/osu-microbench/Dockerfile
index 83f3df3..fa5b697 100644
--- a/osu-microbench/Dockerfile
+++ b/osu-microbench/Dockerfile
@@ -1,14 +1,16 @@
-FROM ghcr.io/rse-ops/flux-spack:ubuntu-20.04
+ARG flux_sched_tag=focal
+FROM fluxrm/flux-sched:${flux_sched_tag}
 
 # docker build -t test .
-# docker run -it test
-# cd libexec/osu-micro-benchmarks/mpi/one-sided/
+# docker run -it --entrypoint bash test
+# cd /opt/osu-benchmark/build.openmpi/libexec/osu-micro-benchmarks/mpi/one-sided
 # flux start --test-size=4
-# flux mini run -ompi=openmpi@5 -n 2 ./osu_get_latency
+# flux run -ompi=openmpi@5 -n 2 ./osu_get_latency
 
 # Prepare tutorial per
 # https://ulhpc-tutorials.readthedocs.io/en/latest/parallel/mpi/OSU_MicroBenchmarks/
 
+USER root
 RUN git clone --depth 1 https://github.com/ULHPC/tutorials /opt/tutorials && \
     mkdir -p /opt/osu-benchmark && \
     cd /opt/osu-benchmark && \
@@ -23,10 +25,6 @@ RUN git clone --depth 1 https://github.com/ULHPC/tutorials /opt/tutorials && \
     cd /opt/osu-benchmark && \
     # Compile based on openmpi
     mkdir -p build.openmpi && cd build.openmpi && \
-    cd /opt/spack-environment && \
-    . spack/share/spack/setup-env.sh && \
-    spack env activate . && \
-    cd - && \
     ../src/osu-micro-benchmarks-${OSU_VERSION}/configure CC=mpicc CFLAGS=-I$(pwd)/../src/osu-micro-benchmarks-${OSU_VERSION}/util --prefix=$(pwd) && \
     make && make install
 
@@ -48,8 +46,7 @@ ENV PORT=${port}
 ENV HOST=${host}
 
 # Add the server
-RUN . /etc/profile.d/z10_spack_environment.sh && \
-    python -m ensurepip --upgrade && \
+RUN ln -s /usr/bin/python3 /usr/bin/python && \
     git clone https://github.com/flux-framework/flux-restful-api /code && \
     cd /code && python -m pip install -r requirements.txt
 
diff --git a/osu-microbench/README.md b/osu-microbench/README.md
index 04a6544..689e6d3 100644
--- a/osu-microbench/README.md
+++ b/osu-microbench/README.md
@@ -12,10 +12,9 @@ If you want to test the benchmarks without the UI:
 docker run -it --entrypoint bash osu-benchmarks
 ```
 ```bash
-. /etc/profile.d/z10_spack_environment.sh
 flux start --test-size=4
 cd /opt/osu-benchmark/build.openmpi/libexec/osu-micro-benchmarks/mpi/one-sided
-flux mini run -ompi=openmpi@5 -n 2 ./osu_get_latency
+flux run -ompi=openmpi@5 -n 2 ./osu_get_latency
 ```
 
 If you want to test with the UI:
diff --git a/osu-microbench/entrypoint.sh b/osu-microbench/entrypoint.sh
index 49fe042..2148f9d 100755
--- a/osu-microbench/entrypoint.sh
+++ b/osu-microbench/entrypoint.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-. /etc/profile.d/z10_spack_environment.sh 
-
 install_branch=${INSTALL_BRANCH}
 install_repo=${INSTALL_REPO:-flux-framework/flux-restful-api}
 

From 79d9f6e7fa1070f390e8ff1795826f2fc7d4d768 Mon Sep 17 00:00:00 2001
From: vsoch <vsoch@users.noreply.github.com>
Date: Fri, 3 Mar 2023 22:34:34 -0700
Subject: [PATCH 2/2] spack base giving errors

for lammps. best to remove it and simplify

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
---
 osu-microbench/uptodate.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-microbench/uptodate.yaml b/osu-microbench/uptodate.yaml
index 7c63862..153e5ce 100644
--- a/osu-microbench/uptodate.yaml
+++ b/osu-microbench/uptodate.yaml
@@ -4,4 +4,4 @@ dockerbuild:
     tag:
       key: "app"
       versions:
-       - "latest"
+       - "focal"