diff --git a/Dockerfile.centos b/Dockerfile.centos index dd80f67..f0b9252 100644 --- a/Dockerfile.centos +++ b/Dockerfile.centos @@ -48,12 +48,6 @@ RUN if [ "x${VERSION}" != "x8" ]; then yum install -y centos-release-scl; fi WORKDIR /root -# Install cmake 3.15 -RUN mkdir -p /opt/vesoft/toolset/cmake \ - && curl -fsSL https://github.com/Kitware/CMake/releases/download/v3.15.5/cmake-3.15.5-Linux-x86_64.tar.gz -O \ - && tar zxf cmake*.tar.gz -C /opt/vesoft/toolset/cmake --strip-components=1 \ - && rm -rf cmake*.tar.gz - ENV TOOLSET_CLANG_DIR=/opt/vesoft/toolset/clang/10.0.0 ENV PATH=/opt/vesoft/toolset/cmake/bin:${TOOLSET_CLANG_DIR}/bin:${PATH} ENV CCACHE_CPP2=1 @@ -66,6 +60,7 @@ 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-llvm --version=10.0.0 \ + && /opt/vesoft/bin/install-cmake \ && ln -snf ${TOOLSET_CLANG_DIR}/bin/llvm-symbolizer /usr/bin/llvm-symbolizer # Install git 2.25 @@ -101,6 +96,6 @@ RUN git clone --branch master --single-branch https://github.com/linux-test-proj RUN if [ "x${VERSION}" == "x7" ]; then pip3 install --no-cache-dir fastcov; fi # Install ossutil64 -RUN wget -q http://gosspublic.alicdn.com/ossutil/1.6.10/ossutil64 \ - && mv ossutil64 /usr/bin/ \ +RUN [[ $(uname -m) = "aarch64" ]] && ARCH="arm"; \ + wget -q -O /usr/bin/ossutil64 "http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil${ARCH}64" \ && chmod +x /usr/bin/ossutil64 diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index dc42e5a..771b925 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -41,12 +41,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ WORKDIR /root -# Install cmake -RUN mkdir -p /opt/vesoft/toolset/cmake \ - && curl -fsSL https://github.com/Kitware/CMake/releases/download/v3.15.5/cmake-3.15.5-Linux-x86_64.tar.gz -O \ - && tar zxf cmake*.tar.gz -C /opt/vesoft/toolset/cmake --strip-components=1 \ - && rm -rf cmake*.tar.gz - ENV TOOLSET_CLANG_DIR=/opt/vesoft/toolset/clang/10.0.0 ENV PATH=/opt/vesoft/toolset/cmake/bin:${TOOLSET_CLANG_DIR}/bin:${PATH} ENV CC=${TOOLSET_CLANG_DIR}/bin/gcc @@ -57,6 +51,7 @@ 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-llvm --version=10.0.0 \ + && /opt/vesoft/bin/install-cmake \ && ln -snf ${TOOLSET_CLANG_DIR}/bin/llvm-symbolizer /usr/bin/llvm-symbolizer # Install git 2.25 @@ -84,6 +79,6 @@ RUN wget -qO- https://github.com/ccache/ccache/releases/download/v3.7.7/ccache-3 && cd ../ && rm -rf ccache-* # Install ossutil64 -RUN wget -q http://gosspublic.alicdn.com/ossutil/1.6.10/ossutil64 \ - && mv ossutil64 /usr/bin/ \ +RUN [[ $(uname -m) = "aarch64" ]] && ARCH="arm"; \ + wget -q -O /usr/bin/ossutil64 "http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil${ARCH}64" \ && chmod +x /usr/bin/ossutil64