Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update thrid-party and gcc #63

Merged
merged 3 commits into from
Jan 28, 2022
Merged

update thrid-party and gcc #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00d19dc
Update Dockerfile.centos
Shinji-IkariG Jan 28, 2022
c1d44bb
Update Dockerfile.ubuntu
Shinji-IkariG Jan 28, 2022
602ef15
Update Dockerfile.centos
Shinji-IkariG Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions Dockerfile.centos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,20 @@ RUN if [ "x${VERSION}" != "x8" ]; then yum install -y centos-release-scl; fi

WORKDIR /root

ENV TOOLSET_CLANG_DIR=/opt/vesoft/toolset/clang/10.0.0
ENV PATH=/opt/vesoft/toolset/cmake/bin:${TOOLSET_CLANG_DIR}/bin:${PATH}
ENV TOOLSET_GCC_DIR=/opt/vesoft/toolset/gcc/9.3.0
ENV PATH=/opt/vesoft/toolset/cmake/bin:${TOOLSET_GCC_DIR}/bin:${PATH}
ENV CCACHE_CPP2=1
ENV CC=${TOOLSET_CLANG_DIR}/bin/gcc
ENV CXX=${TOOLSET_CLANG_DIR}/bin/g++
ENV GCOV=${TOOLSET_CLANG_DIR}/bin/gcov
ENV CC=${TOOLSET_GCC_DIR}/bin/gcc
ENV CXX=${TOOLSET_GCC_DIR}/bin/g++
ENV GCOV=${TOOLSET_GCC_DIR}/bin/gcov

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

&& /opt/vesoft/bin/install-gcc --version=9.3.0 \
&& /opt/vesoft/bin/install-cmake

# Install git 2.25
RUN wget -qO- https://github.com/git/git/archive/v2.25.0.tar.gz | tar zxf - -C ./ \
&& cd git-2.25.0 \
Expand Down
17 changes: 9 additions & 8 deletions Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \

WORKDIR /root

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
ENV CXX=${TOOLSET_CLANG_DIR}/bin/g++
ENV TOOLSET_GCC_DIR=/opt/vesoft/toolset/gcc/9.3.0
ENV PATH=/opt/vesoft/toolset/cmake/bin:${TOOLSET_GCC_DIR}/bin:${PATH}
ENV CC=${TOOLSET_GCC_DIR}/bin/gcc
ENV CXX=${TOOLSET_GCC_DIR}/bin/g++

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
&& /opt/vesoft/bin/install-gcc --version=9.3.0 \
&& /opt/vesoft/bin/install-cmake

# Install git 2.25
RUN wget -qO- https://github.com/git/git/archive/v2.25.0.tar.gz | tar zxf - -C ./ \
Expand All @@ -63,10 +62,12 @@ RUN wget -qO- https://github.com/git/git/archive/v2.25.0.tar.gz | tar zxf - -C .
&& make -j$(nproc) && make install \
&& cd ../ && rm -rf git-2.25.0

# Install nebula third-party 1.0 and 2.0
# Install nebula third-party 1.0 and 2.0 and 3.0
RUN git clone https://github.com/vesoft-inc/nebula-third-party.git \
&& cd nebula-third-party \
&& ./install-third-party.sh \
&& git checkout v2.0 \
&& ./install-third-party.sh \
&& git checkout v1.0 \
&& ./install-third-party.sh \
&& cd .. && rm -rf nebula-third-party
Expand Down