From 41b9feb06be93e348ef7ae61ac9dc71ff4081992 Mon Sep 17 00:00:00 2001
From: jcschaff <schaff.jim@gmail.com>
Date: Sun, 2 Jun 2024 11:10:47 -0400
Subject: [PATCH] update Dockerfile for HPC builds

---
 Dockerfile | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b588f892..f4a40fe1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,32 +1,20 @@
-FROM ubuntu:20.04 as build
+FROM ubuntu:22.04 as build
 
 RUN apt-get -y update && apt-get install -y apt-utils && \
     apt-get install -y -qq -o=Dpkg::Use-Pty=0 build-essential gfortran zlib1g-dev \
-    libhdf5-dev libcurl4-openssl-dev libboost-dev cmake wget python
+    libhdf5-dev ninja-build libcurl4-openssl-dev libboost-all-dev cmake wget python3
 
 COPY . /vcellroot
 
 RUN mkdir -p /vcellroot/build/bin
 WORKDIR /vcellroot/build
 
-RUN /usr/bin/cmake \
+RUN cmake \
+    -G Ninja \
     -DOPTION_TARGET_MESSAGING=ON \
     -DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
     -DOPTION_TARGET_FV_SOLVER=ON \
     -DOPTION_TARGET_DOCS=OFF \
     .. && \
-    make && \
+    ninja && \
     ctest
-
-
-#RUN apt-get update && \
-#    apt-get install -y apt-utils && \
-#    apt-get install -q -y --no-install-recommends curl dnsutils
-#
-#RUN apt-get install -qq -y -o=Dpkg::Use-Pty=0 gcc gfortran zlib1g \
-#    libhdf5-103 libhdf5-cpp-103 libcurl4-openssl-dev zip
-#
-#COPY --from=build /vcellroot/build/bin /vcellbin
-#WORKDIR /vcellbin
-#ENV PATH=/vcellbin:$PATH
-#