Update image (#376)

* Ubuntu 22.04 * swig4 * Optimized build
ICB-DCM · Dec 13, 2022 · d353244 · d353244
1 parent 663e1a8
commit d353244
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/container/charliecloud/parpe_base/Dockerfile b/container/charliecloud/parpe_base/Dockerfile
@@ -1,16 +1,16 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
-COPY . /u18
+COPY . /container-files
 
-RUN /u18/install.sh && rm -rf /tmp && mkdir /tmp
+RUN /container-files/install.sh && rm -rf /tmp && mkdir /tmp
 
 ENV BASH_ENV "/etc/drydock/.env"
 ENV CC clang
 ENV CXX clang++
 ENV OMPI_CC clang
 ENV OMPI_CXX clang++
 
-RUN /u18/install_parpe.sh
+RUN /container-files/install_parpe.sh
 
 ENV PARPE_DIR "/parPE"
 

diff --git a/container/charliecloud/parpe_base/install.sh b/container/charliecloud/parpe_base/install.sh
@@ -13,7 +13,6 @@ locale-gen en_US en_US.UTF-8
 dpkg-reconfigure locales
 
 echo "HOME=$HOME"
-cd /u18
 
 echo "================= parPE requirements ============"
 # using openmpi coming with libboost-all-dev instead of libmpich-dev
@@ -30,16 +29,16 @@ apt-get install -q -y \
   libceres-dev \
   libhdf5-dev \
   libomp-dev \
+  nano \
   python3-dev \
   python3-pip \
   python3-venv \
   libspdlog-dev \
-  swig3.0 \
+  swig \
   unzip \
   wget
 
 # for setuptools to find:
-ln -s /usr/bin/swig3.0 /usr/bin/swig
 python3 -m pip install --upgrade pip
 pip3 install -U setuptools pkgconfig wheel
 

diff --git a/container/charliecloud/parpe_base/install_parpe.sh b/container/charliecloud/parpe_base/install_parpe.sh
@@ -7,7 +7,7 @@ export PARPE_BASE="${PARPE_DIR:-/parPE}"
 
 # unpack git archive
 mkdir "$PARPE_BASE" && cd "$PARPE_BASE"
-tar -xzf /u18/parpe.tar.gz
+tar -xzf /container-files/parpe.tar.gz
 
 # Build dependencies
 
@@ -18,7 +18,7 @@ cd "${AMICI_PATH}" \
   && scripts/buildSundials.sh
 mkdir -p "${AMICI_PATH}/build" && cd "${AMICI_PATH}/build"
 cmake \
-  -DCMAKE_BUILD_TYPE=Debug \
+  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
   -DENABLE_PYTHON=ON \
   -DBUILD_TESTS=OFF \
   .. && make -j12