From 2b0d041346e1045d0c68fcaa9555930adad62154 Mon Sep 17 00:00:00 2001 From: beroset Date: Tue, 23 Jan 2024 22:21:05 -0500 Subject: [PATCH] Update docker instructions to use Ubuntu 22.04 (#2594) This updates the docker instructions to build using a base image of Ubuntu 22.04 rather than 18.04 which no longer builds. This fixes Signed-off-by: Ed Beroset --- docs/user-guide/installation/docker.md | 34 ++++++++++++-------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/docs/user-guide/installation/docker.md b/docs/user-guide/installation/docker.md index 9775841eee..03c4bfe76a 100644 --- a/docs/user-guide/installation/docker.md +++ b/docs/user-guide/installation/docker.md @@ -6,36 +6,33 @@ ## Dockerfile -This `Dockerfile` will build and install HELICS in Ubuntu 18.04 with +This `Dockerfile` will build and install HELICS in Ubuntu 22.04 with Python support. ```dockerfile -FROM ubuntu:18.04 as builder +FROM ubuntu:22.04 as builder + +WORKDIR /root/develop RUN apt update && apt install -y \ - libboost-dev \ - libboost-filesystem-dev \ - libboost-program-options-dev \ - libboost-test-dev \ libzmq5-dev python3-dev \ + libboost-all-dev \ build-essential swig cmake git -WORKDIR /root/develop - -RUN git clone https://github.com/GMLC-TDC/HELICS.git helics +RUN git clone --recurse-submodules \ + https://github.com/GMLC-TDC/HELICS.git helics -WORKDIR /root/develop/helics/build +WORKDIR /root/develop/helics RUN cmake \ -DCMAKE_INSTALL_PREFIX=/helics \ - .. -RUN make -j8 && make install + -DCMAKE_BUILD_TYPE=Release \ + -B build -FROM ubuntu:18.04 +RUN cmake --build build -j -t install -RUN apt update && apt install -y --no-install-recommends \ - libboost-filesystem1.65.1 libboost-program-options1.65.1 \ - libboost-test1.65.1 libzmq5 + +FROM ubuntu:22.04 COPY --from=builder /helics /usr/local/ @@ -43,8 +40,9 @@ ENV PYTHONPATH /usr/local/python # Python must be installed after the PYTHONPATH is set above for it to # recognize and import libhelicsSharedLib.so. -RUN apt install -y --no-install-recommends python3-dev \ - && rm -rf /var/lib/apt/lists/* +RUN apt update && apt install -y --no-install-recommends \ + libboost-filesystem1.74.0 libboost-program-options1.74.0 \ + libboost-test1.74.0 libzmq5 pip python3-dev RUN pip install helics