Skip to content

Commit

Permalink
Update versions of packages in Ubuntu 20.04 images (#39)
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenswat authored Sep 8, 2021
1 parent bc04ec2 commit 7ea4420
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 5 deletions.
12 changes: 10 additions & 2 deletions ubuntu2004/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,17 @@ RUN mkdir src \
&& cd .. \
&& rm -rf src

# nlohmann's JSON
RUN mkdir src \
&& ${GET} https://github.com/nlohmann/json/archive/refs/tags/v3.10.2.tar.gz \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
&& cmake --build build -- install \
&& rm -rf build src

# ROOT
RUN mkdir src \
&& ${GET} https://root.cern/download/root_v6.20.04.source.tar.gz \
&& ${GET} https://root.cern/download/root_v6.24.06.source.tar.gz \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
Expand All @@ -115,7 +123,7 @@ RUN mkdir src \
ENV LD_LIBRARY_PATH /usr/local/lib
ENV PYTHON_PATH /usr/local/lib
RUN mkdir src \
&& ${GET} https://github.com/AIDASoft/DD4hep/archive/v01-11-02.tar.gz \
&& ${GET} https://github.com/AIDASoft/DD4hep/archive/v01-17.tar.gz \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
13 changes: 10 additions & 3 deletions ubuntu2004_cuda/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ENV GET curl --location --silent --create-dirs
ENV UNPACK_TO_SRC tar -xz --strip-components=1 --directory src
ENV PREFIX /usr/local

# CMake 3.17.3 version in APT is too old
# CMake 3.16.3 version in APT is too old
# requires rsync; installation uses `rsync` instead of `install`
RUN mkdir src \
&& ${GET} https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-Linux-x86_64.tar.gz \
Expand Down Expand Up @@ -109,10 +109,17 @@ RUN mkdir src \
&& cmake --build build -- install \
&& rm -rf build src

# nlohmann's JSON
RUN mkdir src \
&& ${GET} https://github.com/nlohmann/json/archive/refs/tags/v3.10.2.tar.gz \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
&& cmake --build build -- install \
&& rm -rf build src

# ROOT
RUN mkdir src \
&& ${GET} https://root.cern/download/root_v6.20.04.source.tar.gz \
&& ${GET} https://root.cern/download/root_v6.24.06.source.tar.gz \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
Expand All @@ -133,7 +140,7 @@ RUN mkdir src \
ENV LD_LIBRARY_PATH /usr/local/lib
ENV PYTHON_PATH /usr/local/lib
RUN mkdir src \
&& ${GET} https://github.com/AIDASoft/DD4hep/archive/v01-11-02.tar.gz \
&& ${GET} https://github.com/AIDASoft/DD4hep/archive/v01-17.tar.gz \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
Expand Down

0 comments on commit 7ea4420

Please sign in to comment.