Skip to content

Commit

Permalink
Install CMake in Merlin base image (instead of copying from build)
Browse files Browse the repository at this point in the history
Since the CMake install is a bit more involved than just copying the executable, let's just install it in the base container directly.
  • Loading branch information
karlhigley committed Aug 9, 2022
1 parent cf83cb3 commit df88d4b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions docker/dockerfile.merlin
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,9 @@ RUN apt update -y --fix-missing && \

RUN ln -s /usr/bin/python3 /usr/bin/python

# CMake
COPY --chown=1000:1000 --from=build /usr/local/bin/cmake /usr/local/bin/cmake
# Install cmake (used by downstream images)
RUN apt remove --purge cmake -y && wget http://www.cmake.org/files/v3.21/cmake-3.21.1.tar.gz && \
tar xf cmake-3.21.1.tar.gz && cd cmake-3.21.1 && ./configure && make -j$(nproc) && make install

# Includes
COPY --chown=1000:1000 --from=build /usr/include /usr/include/
Expand Down

0 comments on commit df88d4b

Please sign in to comment.