From 61e1eac7725ccad664d696b6dda321a67d3326a5 Mon Sep 17 00:00:00 2001 From: bob Date: Fri, 10 Nov 2023 19:46:27 +0100 Subject: [PATCH 1/3] fixed MOAB install with current openmc_install_scripts commit ceb1a4c79b602d7cc38b9387471d46b05193476 --- .gitmodules | 3 +++ msre_docker/Dockerfile | 2 +- msre_docker/openmc_install_scripts | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 msre_docker/openmc_install_scripts diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..12bf9fb --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "msre_docker/openmc_install_scripts"] + path = msre_docker/openmc_install_scripts + url = git@github.com:bvhoof/openmc_install_scripts.git diff --git a/msre_docker/Dockerfile b/msre_docker/Dockerfile index 8a8dd9a..5688bba 100644 --- a/msre_docker/Dockerfile +++ b/msre_docker/Dockerfile @@ -25,7 +25,7 @@ COPY openmc_install_scripts/Debian11/embree-install.sh . RUN ./embree-install.sh "$compile_cores" COPY openmc_install_scripts/Debian11/moab-install.sh . -RUN ./moab-install.sh "$compile_cores" +RUN sudo mkdir -p /opt/lib/cmake && sudo ./moab-install.sh "$compile_cores" COPY openmc_install_scripts/Debian11/double_down-install.sh . RUN ./double_down-install.sh "$compile_cores" diff --git a/msre_docker/openmc_install_scripts b/msre_docker/openmc_install_scripts new file mode 160000 index 0000000..5f459da --- /dev/null +++ b/msre_docker/openmc_install_scripts @@ -0,0 +1 @@ +Subproject commit 5f459da3a4556f3d296f5d597415ac961d74ebe8 From 6863be7497d6f601225ad639f20ed8d5bcf04ca6 Mon Sep 17 00:00:00 2001 From: bob Date: Sat, 11 Nov 2023 11:51:27 +0100 Subject: [PATCH 2/3] root permissions install this makes the container compatible with the openmc_install_scripts commit ceb1a4c79b602d7cc38b9387471d46b05193476c --- msre_docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/msre_docker/Dockerfile b/msre_docker/Dockerfile index 5688bba..d1bf875 100644 --- a/msre_docker/Dockerfile +++ b/msre_docker/Dockerfile @@ -28,13 +28,13 @@ COPY openmc_install_scripts/Debian11/moab-install.sh . RUN sudo mkdir -p /opt/lib/cmake && sudo ./moab-install.sh "$compile_cores" COPY openmc_install_scripts/Debian11/double_down-install.sh . -RUN ./double_down-install.sh "$compile_cores" +RUN DEBIAN_FRONTEND=noninteractive && sudo ./double_down-install.sh "$compile_cores" COPY openmc_install_scripts/Debian11/dagmc-install.sh . -RUN DEBIAN_FRONTEND=noninteractive && ./dagmc-install.sh "$compile_cores" +RUN DEBIAN_FRONTEND=noninteractive && sudo ./dagmc-install.sh "$compile_cores" COPY openmc_install_scripts/Debian11/openmc-install.sh . -RUN DEBIAN_FRONTEND=noninteractive && ./openmc-install.sh "$compile_cores" +RUN DEBIAN_FRONTEND=noninteractive && sudo ./openmc-install.sh "$compile_cores" #clean up a bit RUN rm *-install.sh From 167cff162d5215feb2c5d141a0b57e3cc211e73e Mon Sep 17 00:00:00 2001 From: bob Date: Fri, 17 Nov 2023 16:36:45 +0100 Subject: [PATCH 3/3] added missing path --- msre_docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/msre_docker/Dockerfile b/msre_docker/Dockerfile index d1bf875..bb7aaf2 100644 --- a/msre_docker/Dockerfile +++ b/msre_docker/Dockerfile @@ -35,6 +35,7 @@ RUN DEBIAN_FRONTEND=noninteractive && sudo ./dagmc-install.sh "$compile_cores" COPY openmc_install_scripts/Debian11/openmc-install.sh . RUN DEBIAN_FRONTEND=noninteractive && sudo ./openmc-install.sh "$compile_cores" +ENV PATH="${PATH}:/usr/local/lib/bin" #clean up a bit RUN rm *-install.sh