From 900850cde005475eee723f43b37e17dcfe8c94af Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:09:44 +0800 Subject: [PATCH 01/11] Create Dockerfile.ubuntu2404 --- Dockerfile.ubuntu2404 | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Dockerfile.ubuntu2404 diff --git a/Dockerfile.ubuntu2404 b/Dockerfile.ubuntu2404 new file mode 100644 index 0000000..7fec61c --- /dev/null +++ b/Dockerfile.ubuntu2404 @@ -0,0 +1,69 @@ +FROM ubuntu:24.04 + +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +ENV LANG=en_US.utf8 +SHELL ["/bin/bash", "-c"] +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update && apt-get install -y --no-install-recommends \ + autoconf \ + ca-certificates \ + curl \ + gettext \ + gnupg2 \ + libc-dev \ + libcurl4-gnutls-dev \ + libexpat1-dev \ + libldap2-dev \ + libreadline-dev \ + libssl-dev \ + libz-dev \ + locales-all \ + lsb-release \ + m4 \ + make \ + ncurses-dev \ + ninja-build \ + openssh-client \ + python3-dev \ + python3-pip \ + sudo \ + tzdata \ + unzip \ + wget \ + xz-utils \ + lcov \ + git \ + cmake \ + build-essential \ + vim \ + ccache \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /root + +# Install nebula third-party master +RUN git clone https://github.com/vesoft-inc/nebula-third-party.git \ + && cd nebula-third-party \ + && ./install-third-party.sh \ + && cd .. && rm -rf nebula-third-party + +# fastcov +RUN pip3 install --no-cache-dir fastcov + +# Install ossutil +RUN curl https://gosspublic.alicdn.com/ossutil/install.sh | bash + +#Install mold +RUN mkdir /usr/local/mold && wget -qO- https://github.com/rui314/mold/releases/download/v2.34.1/mold-2.34.1-$(uname -m)-linux.tar.gz | tar xzf - --strip-components=1 -C /usr/local/mold/ +ENV PATH=/usr/local/mold/bin:${PATH} + +#Install minio client +RUN if [ "$(uname -m)" = "x86_64" ]; then \ + curl -O https://dl.min.io/client/mc/release/linux-amd64/mc; \ + else \ + curl -O https://dl.min.io/client/mc/release/linux-arm64/mc; \ + fi \ + && chmod +x mc \ + && mv mc /usr/local/bin/ From caf6f39a16928fdbcb7ea1b4d76e1a90ac6aa45c Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:21:40 +0800 Subject: [PATCH 02/11] Update docker.yml --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8260265..7e90e6f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,6 +27,7 @@ jobs: # - {"name": "ubuntu1604", "version": "xenial", "file": "ubuntu"} # - {"name": "ubuntu1804", "version": "bionic", "file": "ubuntu"} - {"name": "ubuntu2004", "version": "focal", "file": "ubuntu"} + - {"name": "ubuntu2404", "version": "noble", "file": "ubuntu2404"} steps: - uses: actions/checkout@v3 - uses: docker/login-action@v2 From 6b930038ce746ec0e11264907910ad4faacca7b9 Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:25:28 +0800 Subject: [PATCH 03/11] Update Dockerfile.ubuntu --- Dockerfile.ubuntu | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 853dfdc..fe3a6c6 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,13 +1,9 @@ ARG VERSION=xenial -ARG DEBIAN_FRONTEND=noninteractive - FROM ubuntu:${VERSION} -ARG VERSION=xenial - +ARG DEBIAN_FRONTEND=noninteractive ENV TZ=Asia/Shanghai RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - ENV LANG=en_US.utf8 RUN apt-get update && apt-get install -y --no-install-recommends \ From b8a100aac8437d108df6ff185877145419a059ed Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:26:27 +0800 Subject: [PATCH 04/11] Update Dockerfile.ubuntu2404 --- Dockerfile.ubuntu2404 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ubuntu2404 b/Dockerfile.ubuntu2404 index 7fec61c..151f180 100644 --- a/Dockerfile.ubuntu2404 +++ b/Dockerfile.ubuntu2404 @@ -1,4 +1,4 @@ -FROM ubuntu:24.04 +FROM ubuntu:noble ENV TZ=Asia/Shanghai RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone From e98484c9070d5e647f1b336e4f5cb55d32577429 Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Fri, 1 Nov 2024 10:35:41 +0800 Subject: [PATCH 05/11] Update Dockerfile.ubuntu2404 --- Dockerfile.ubuntu2404 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile.ubuntu2404 b/Dockerfile.ubuntu2404 index 151f180..32099f0 100644 --- a/Dockerfile.ubuntu2404 +++ b/Dockerfile.ubuntu2404 @@ -55,10 +55,6 @@ RUN pip3 install --no-cache-dir fastcov # Install ossutil RUN curl https://gosspublic.alicdn.com/ossutil/install.sh | bash -#Install mold -RUN mkdir /usr/local/mold && wget -qO- https://github.com/rui314/mold/releases/download/v2.34.1/mold-2.34.1-$(uname -m)-linux.tar.gz | tar xzf - --strip-components=1 -C /usr/local/mold/ -ENV PATH=/usr/local/mold/bin:${PATH} - #Install minio client RUN if [ "$(uname -m)" = "x86_64" ]; then \ curl -O https://dl.min.io/client/mc/release/linux-amd64/mc; \ From a8182b933364f666bfc047f91d16657b63bd1607 Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Mon, 18 Nov 2024 20:05:10 +0800 Subject: [PATCH 06/11] Update Dockerfile.centos7 --- Dockerfile.centos7 | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Dockerfile.centos7 b/Dockerfile.centos7 index 57144f2..ddad1e4 100644 --- a/Dockerfile.centos7 +++ b/Dockerfile.centos7 @@ -76,20 +76,10 @@ 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 and 3.0 and 3.3 +# Install nebula third-party master RUN git clone https://github.com/vesoft-inc/nebula-third-party.git \ && cd nebula-third-party \ && ./install-third-party.sh \ - && git checkout origin/release-3.3 \ - && ./install-third-party.sh \ - && git checkout origin/release-3.4-cloud \ - && ./install-third-party.sh \ - && git checkout origin/v3.0 \ - && ./install-third-party.sh \ - && git checkout origin/v2.0 \ - && ./install-third-party.sh \ - && git checkout origin/v1.0 \ - && ./install-third-party.sh \ && cd .. && rm -rf nebula-third-party # Install ccache From 50ea29ab212d72329572eb84230ac3b6b6ecffa7 Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Mon, 18 Nov 2024 20:05:33 +0800 Subject: [PATCH 07/11] Update Dockerfile.centos8 --- Dockerfile.centos8 | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Dockerfile.centos8 b/Dockerfile.centos8 index a52b320..688d7ae 100644 --- a/Dockerfile.centos8 +++ b/Dockerfile.centos8 @@ -49,7 +49,7 @@ RUN yum update -y && yum install -y epel-release \ WORKDIR /root ENV TOOLSET_CLANG_DIR=/opt/vesoft/toolset/clang/10.0.0 -ENV TOOLSET_GCC_DIR=/opt/vesoft/toolset/gcc/9.3.0 +ENV TOOLSET_GCC_DIR=/opt/vesoft/toolset/gcc/9.5.0 ENV PATH=/opt/vesoft/toolset/cmake/bin:${TOOLSET_GCC_DIR}/bin:${TOOLSET_CLANG_DIR}/bin:${PATH} ENV CCACHE_CPP2=1 ENV CC=${TOOLSET_GCC_DIR}/bin/gcc @@ -77,18 +77,10 @@ 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 and 3.0 and 3.3 +# Install nebula third-party master RUN git clone https://github.com/vesoft-inc/nebula-third-party.git \ && cd nebula-third-party \ && ./install-third-party.sh \ - && git checkout origin/release-3.3 \ - && ./install-third-party.sh \ - && git checkout origin/v3.0 \ - && ./install-third-party.sh \ - && git checkout origin/v2.0 \ - && ./install-third-party.sh \ - && git checkout origin/v1.0 \ - && ./install-third-party.sh \ && cd .. && rm -rf nebula-third-party # Install ccache From 7a700b5c4565ec8d816002bed318779318671ae3 Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Mon, 18 Nov 2024 20:05:53 +0800 Subject: [PATCH 08/11] Update Dockerfile.centos7 --- Dockerfile.centos7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.centos7 b/Dockerfile.centos7 index ddad1e4..2a04ca8 100644 --- a/Dockerfile.centos7 +++ b/Dockerfile.centos7 @@ -48,7 +48,7 @@ RUN sed -i 's/^mirrorlist=/#mirrorlist=/g' /etc/yum.repos.d/CentOS-Base.repo && WORKDIR /root ENV TOOLSET_CLANG_DIR=/opt/vesoft/toolset/clang/10.0.0 -ENV TOOLSET_GCC_DIR=/opt/vesoft/toolset/gcc/9.3.0 +ENV TOOLSET_GCC_DIR=/opt/vesoft/toolset/gcc/9.5.0 ENV PATH=/opt/vesoft/toolset/cmake/bin:${TOOLSET_GCC_DIR}/bin:${TOOLSET_CLANG_DIR}/bin:${PATH} ENV CCACHE_CPP2=1 ENV CC=${TOOLSET_GCC_DIR}/bin/gcc @@ -59,7 +59,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-gcc --version=9.3.0 \ + && /opt/vesoft/bin/install-gcc --version=9.5.0 \ && /opt/vesoft/bin/install-llvm --version=10.0.0 # Install cmake From dac86969fdd158d05b7b816df624cbc448d12ea6 Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Mon, 18 Nov 2024 20:06:04 +0800 Subject: [PATCH 09/11] Update Dockerfile.centos8 --- Dockerfile.centos8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.centos8 b/Dockerfile.centos8 index 688d7ae..d4dc70e 100644 --- a/Dockerfile.centos8 +++ b/Dockerfile.centos8 @@ -60,7 +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-gcc --version=9.3.0 \ + && /opt/vesoft/bin/install-gcc --version=9.5.0 \ && /opt/vesoft/bin/install-llvm --version=10.0.0 # Install cmake From 96adc45ba269582baa10e0350bcb7a57cb19220e Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Mon, 18 Nov 2024 20:13:18 +0800 Subject: [PATCH 10/11] Update Dockerfile.ubuntu --- Dockerfile.ubuntu | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index fe3a6c6..9284a5e 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -42,7 +42,7 @@ 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 TOOLSET_GCC_DIR=/opt/vesoft/toolset/gcc/9.3.0 +ENV TOOLSET_GCC_DIR=/opt/vesoft/toolset/gcc/9.5.0 ENV PATH=/opt/vesoft/toolset/cmake/bin:${TOOLSET_GCC_DIR}/bin:${TOOLSET_CLANG_DIR}/bin:${PATH} ENV CC=${TOOLSET_GCC_DIR}/bin/gcc ENV CXX=${TOOLSET_GCC_DIR}/bin/g++ @@ -52,7 +52,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-gcc --version=9.3.0 \ + && /opt/vesoft/bin/install-gcc --version=9.5.0 \ && /opt/vesoft/bin/install-llvm --version=10.0.0 # Install cmake @@ -69,20 +69,10 @@ 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 and 3.0 and 3.3 +# Install nebula third-party master RUN git clone https://github.com/vesoft-inc/nebula-third-party.git \ && cd nebula-third-party \ && ./install-third-party.sh \ - && git checkout origin/release-3.3 \ - && ./install-third-party.sh \ - && git checkout origin/release-3.4-cloud \ - && ./install-third-party.sh \ - && git checkout origin/v3.0 \ - && ./install-third-party.sh \ - && git checkout origin/v2.0 \ - && ./install-third-party.sh \ - && git checkout origin/v1.0 \ - && ./install-third-party.sh \ && cd .. && rm -rf nebula-third-party # Install ccache From 9c975d68308e5eb66f1fdae7d223c212efeb9060 Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Mon, 18 Nov 2024 20:44:44 +0800 Subject: [PATCH 11/11] Update docker.yml --- .github/workflows/docker.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7e90e6f..ed2b16d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -29,19 +29,19 @@ jobs: - {"name": "ubuntu2004", "version": "focal", "file": "ubuntu"} - {"name": "ubuntu2404", "version": "noble", "file": "ubuntu2404"} steps: - - uses: actions/checkout@v3 - - uses: docker/login-action@v2 + - uses: actions/checkout@v4 + - uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 - - uses: docker/build-push-action@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 + - uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile.${{ matrix.os.file }} platforms: linux/amd64,linux/arm64 - tags: vesoft/nebula-dev:${{ matrix.os.name }} + tags: vesoft/nebula-dev:${{ matrix.os.name }}-v5 push: true build-args: | VERSION=${{ matrix.os.version }}