From 5885c4a6221c61c752c6ef6a167661415ce96ebf Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 17 Sep 2020 15:20:33 -0500 Subject: [PATCH 1/2] Small fixes to Dockerfile --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 478dfc49591..a59424858d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,18 @@ FROM ubuntu:latest # Setup environment variables for Docker image -ENV FC=/usr/bin/mpif90 CC=/usr/bin/mpicc CXX=/usr/bin/mpicxx \ +ENV CC=/usr/bin/mpicc CXX=/usr/bin/mpicxx \ PATH=/opt/openmc/bin:/opt/NJOY2016/build:$PATH \ LD_LIBRARY_PATH=/opt/openmc/lib:$LD_LIBRARY_PATH \ OPENMC_CROSS_SECTIONS=/root/nndc_hdf5/cross_sections.xml \ - OPENMC_ENDF_DATA=/root/endf-b-vii.1 + OPENMC_ENDF_DATA=/root/endf-b-vii.1 \ + DEBIAN_FRONTEND=noninteractive # Install dependencies from Debian package manager RUN apt-get update -y && \ apt-get upgrade -y && \ apt-get install -y python3-pip && \ - apt-get install -y wget git emacs && \ + apt-get install -y wget git && \ apt-get install -y gfortran g++ cmake && \ apt-get install -y mpich libmpich-dev && \ apt-get install -y libhdf5-serial-dev libhdf5-mpich-dev && \ @@ -28,8 +29,8 @@ RUN git clone https://github.com/njoy/NJOY2016 /opt/NJOY2016 && \ cmake -Dstatic=on .. && make 2>/dev/null && make install # Clone and install OpenMC -RUN git clone https://github.com/openmc-dev/openmc.git /opt/openmc && \ - cd /opt/openmc && mkdir -p build && cd build && \ +RUN git clone --recurse-submodules https://github.com/openmc-dev/openmc.git \ + /opt/openmc && cd /opt/openmc && mkdir -p build && cd build && \ cmake -Doptimize=on -DHDF5_PREFER_PARALLEL=on .. && \ make && make install && \ cd .. && pip install -e .[test] From 5d31dfde6fc51b607ea8a1165814e514823013d2 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 28 Sep 2020 15:16:10 -0500 Subject: [PATCH 2/2] Use python-is-python3 so that 'python3' is not necessary --- Dockerfile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a59424858d9..4d3fdb1e9e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,12 +11,10 @@ ENV CC=/usr/bin/mpicc CXX=/usr/bin/mpicxx \ # Install dependencies from Debian package manager RUN apt-get update -y && \ apt-get upgrade -y && \ - apt-get install -y python3-pip && \ - apt-get install -y wget git && \ - apt-get install -y gfortran g++ cmake && \ - apt-get install -y mpich libmpich-dev && \ - apt-get install -y libhdf5-serial-dev libhdf5-mpich-dev && \ - apt-get install -y imagemagick && \ + apt-get install -y \ + python3-pip python-is-python3 wget git gfortran g++ cmake \ + mpich libmpich-dev libhdf5-serial-dev libhdf5-mpich-dev \ + imagemagick && \ apt-get autoremove # Update system-provided pip @@ -36,4 +34,4 @@ RUN git clone --recurse-submodules https://github.com/openmc-dev/openmc.git \ cd .. && pip install -e .[test] # Download cross sections (NNDC and WMP) and ENDF data needed by test suite -RUN ./opt/openmc/tools/ci/download-xs.sh +RUN /opt/openmc/tools/ci/download-xs.sh