Skip to content

Commit

Permalink
Replace cmake with the official version (#78)
Browse files Browse the repository at this point in the history
* Update Dockerfile.ubuntu

* Replace cmake with the official version

* Update Dockerfile.centos7

* Update Dockerfile.centos8
  • Loading branch information
Shinji-IkariG authored Dec 13, 2023
1 parent 9852c6d commit d7e097d
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
9 changes: 7 additions & 2 deletions Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,13 @@ SHELL ["/bin/bash", "-c"]
# Install gcc and llvm by nebula-gears
RUN bash <(curl -s https://raw.githubusercontent.com/vesoft-inc/nebula-gears/master/install) --prefix=/opt/vesoft/ \
&& /opt/vesoft/bin/install-gcc --version=9.3.0 \
&& /opt/vesoft/bin/install-llvm --version=10.0.0 \
&& /opt/vesoft/bin/install-cmake
&& /opt/vesoft/bin/install-llvm --version=10.0.0

# Install cmake
RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0-linux-$(uname -m).sh \
&& chmod +x cmake-3.20.0-linux-$(uname -m).sh \
&& ./cmake-3.20.0-linux-$(uname -m).sh --skip-license --prefix=/usr/local \
&& rm cmake-3.20.0-linux-$(uname -m).sh

# Install git 2.25
RUN wget -qO- https://github.com/git/git/archive/v2.25.0.tar.gz | tar zxf - -C ./ \
Expand Down
9 changes: 7 additions & 2 deletions Dockerfile.centos8
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,13 @@ SHELL ["/bin/bash", "-c"]
# Install gcc and llvm by nebula-gears
RUN bash <(curl -s https://raw.githubusercontent.com/vesoft-inc/nebula-gears/master/install) --prefix=/opt/vesoft/ \
&& /opt/vesoft/bin/install-gcc --version=9.3.0 \
&& /opt/vesoft/bin/install-llvm --version=10.0.0 \
&& /opt/vesoft/bin/install-cmake
&& /opt/vesoft/bin/install-llvm --version=10.0.0

# Install cmake
RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0-linux-$(uname -m).sh \
&& chmod +x cmake-3.20.0-linux-$(uname -m).sh \
&& ./cmake-3.20.0-linux-$(uname -m).sh --skip-license --prefix=/usr/local \
&& rm cmake-3.20.0-linux-$(uname -m).sh

# Install git 2.25
RUN wget -qO- https://github.com/git/git/archive/v2.25.0.tar.gz | tar zxf - -C ./ \
Expand Down
9 changes: 7 additions & 2 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,13 @@ SHELL ["/bin/bash", "-c"]
# Install gcc and llvm by nebula-gears
RUN bash <(curl -s https://raw.githubusercontent.com/vesoft-inc/nebula-gears/master/install) --prefix=/opt/vesoft/ \
&& /opt/vesoft/bin/install-gcc --version=9.3.0 \
&& /opt/vesoft/bin/install-llvm --version=10.0.0 \
&& /opt/vesoft/bin/install-cmake
&& /opt/vesoft/bin/install-llvm --version=10.0.0

# Install cmake
RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0-linux-$(uname -m).sh \
&& chmod +x cmake-3.20.0-linux-$(uname -m).sh \
&& ./cmake-3.20.0-linux-$(uname -m).sh --skip-license --prefix=/usr/local \
&& rm cmake-3.20.0-linux-$(uname -m).sh

# Install git 2.25
RUN wget -qO- https://github.com/git/git/archive/v2.25.0.tar.gz | tar zxf - -C ./ \
Expand Down

0 comments on commit d7e097d

Please sign in to comment.