[ci][workflow] Change base image to: dingo-store-xxx-dev:eureka

dingodb · Jan 12, 2025 · 87ffea8 · 87ffea8
1 parent d7a15d5
commit 87ffea8
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 30 deletions.
diff --git a/.github/workflows/ci_rocky.yml → .github/workflows/ci_rocky8.yml b/.github/workflows/ci_rocky.yml → .github/workflows/ci_rocky8.yml
@@ -1,4 +1,4 @@
-name: CMake_rocky
+name: CMake_rocky8
 
 on:
   push:
@@ -16,7 +16,7 @@ jobs:
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ubuntu-latest
-    container: dingodatabase/dingo-store-rocky-8-dev:latest
+    container: dingodatabase/dingo-store-rocky-8-dev:eureka
 
     steps:
     - uses: actions/checkout@v4
@@ -27,7 +27,7 @@ jobs:
     - name: Clone Submodule
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: git submodule update --init --recursive 
+      run: git submodule sync --recursive && git submodule update --init --recursive --progress
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

diff --git a/.github/workflows/ci_rocky9.yml b/.github/workflows/ci_rocky9.yml
@@ -16,7 +16,7 @@ jobs:
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ubuntu-latest
-    container: dingodatabase/dingo-store-rocky-9-dev:latest
+    container: dingodatabase/dingo-store-rocky-9-dev:eureka
 
     steps:
     - uses: actions/checkout@v4
@@ -39,5 +39,12 @@ jobs:
       # Build your program with the given configuration
       run: source /opt/intel/oneapi/setvars.sh && cmake --build ./build --config ${{env.BUILD_TYPE}}
 
+    - name: Archive the dingo directory
+      run: |
+        tar -czvf dingo-store.tar.gz  scripts build/bin/dingodb* conf/ 
 
-
+    - name: copy artifactory to another workflow
+      uses: actions/upload-artifact@v4
+      with:
+          name: dingo-store.tar.gz
+          path: ./dingo-store.tar.gz
diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml
@@ -16,15 +16,19 @@ jobs:
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ubuntu-latest
+    container: dingodatabase/dingo-store-ubuntu-22.04-dev:eureka
 
     steps:
     - uses: actions/checkout@v4
 
+    - name: Set Safe Dir
+      run: git config --global --add safe.directory $PWD
+
     - name: Set Limit
       run: |
-          sudo prlimit --pid $$ --nofile=1048576:1048576
-          sudo sysctl fs.inotify.max_user_instances=1280
-          sudo sysctl fs.inotify.max_user_watches=655360
+          prlimit --pid $$ --nofile=1048576:1048576
+          sysctl fs.inotify.max_user_instances=1280
+          sysctl fs.inotify.max_user_watches=655360
     - name: Clone Submodule
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type

diff --git a/.github/workflows/release-dockerhub.yml b/.github/workflows/release-dockerhub.yml
@@ -6,7 +6,7 @@ name: Release-Dockerhub
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
   workflow_run:
-    workflows: ["CMake_rocky"]
+    workflows: ["CMake_rocky9"]
     types:
       - completed
     on:
@@ -32,7 +32,7 @@ jobs:
         uses: dawidd6/action-download-artifact@v2
         with:
             github_token: ${{secrets.GITHUB_TOKEN}}
-            workflow: ci_rocky.yml
+            workflow: ci_rocky9.yml
             name: dingo-store.tar.gz
 
       - name: rename artifactory name

diff --git a/docker/dev_build_from_docker.md b/docker/dev_build_from_docker.md
@@ -18,38 +18,38 @@ cd dingo-store
 
 docker build docker/ubuntu18/  -t dingo-store-ubuntu-18.04-dev
 
-docker build docker/ubuntu22/  -t dingo-store-ubuntu-22.04-dev
+docker build docker/ubuntu22/  -t dingo-store-ubuntu-22.04-dev:eureka
 
 docker build docker/centos7/  -t dingo-store-centos-7-dev
 
 docker build docker/centos8/  -t dingo-store-centos-8-dev
 
-docker build docker/rocky88/  -t dingo-store-rocky-8.8-dev
+docker build docker/rocky8/  -t dingo-store-rocky-8-dev:eureka
 
-docker build docker/rocky92/  -t dingo-store-rocky-9.2-dev
+docker build docker/rocky9/  -t dingo-store-rocky-9-dev:eureka
 ``````
 
 If you want to start quickly, we can refer to the following commands to pull container
 
 ``````
 docker pull dingodatabase/dingo-store-ubuntu-18.04-dev
 
-docker pull dingodatabase/dingo-store-ubuntu-22.04-dev
+docker pull dingodatabase/dingo-store-ubuntu-22.04-dev:eureka
 
 docker pull dingodatabase/dingo-store-centos-7-dev
 
 docker pull dingodatabase/dingo-store-centos-8-dev
 
-docker pull dingodatabase/dingo-store-rocky-8.8-dev
+docker pull dingodatabase/dingo-store-rocky-8-dev:eureka
 
-docker pull dingodatabase/dingo-store-rocky-9.2-dev
+docker pull dingodatabase/dingo-store-rocky-9-dev:eureka
 ``````
 
 ## Use docker container
 
-After building the docker image succeed, we can use docker run to launch the docker service. centos8 docker image for example:
+After building the docker image succeed, we can use docker run to launch the docker service. rocky9 docker image for example:
 
 ``````
-docker run  -it dingo-store-centos-8-dev
+docker run  -it dingo-store-rocky-9-dev:eureka
 ``````
 
diff --git a/docker/rocky8/Dockerfile b/docker/rocky8/Dockerfile
@@ -1,4 +1,5 @@
-FROM rockylinux/rockylinux:8.9
+# FROM rockylinux/rockylinux:8.9
+FROM dingodatabase/dingo-eureka:rocky8
 
 ENV TZ=Asia/Shanghai
 SHELL ["/bin/bash", "-c"]
@@ -26,7 +27,7 @@ RUN dnf update -y  \
 # install rust
 # RUN wget https://sh.rustup.rs --content-disposition
 # RUN sh rustup-init.sh -y
-RUN wget https://static.rust-lang.org/dist/rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && xz -d rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && tar -xf rust-1.78.0-x86_64-unknown-linux-gnu.tar && cd rust-1.78.0-x86_64-unknown-linux-gnu && sh install.sh --prefix=/opt/rust/ && cd ../../ && rm -rf rust-1.78.0-x86_64-unknown-linux-gnu*
+RUN wget https://static.rust-lang.org/dist/rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && xz -d rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && tar -xf rust-1.78.0-x86_64-unknown-linux-gnu.tar && cd rust-1.78.0-x86_64-unknown-linux-gnu && sh install.sh --prefix=/opt/rust/ && cd .. && rm -rf rust-1.78.0-x86_64-unknown-linux-gnu*
 
 # soure env
 RUN echo "source /opt/intel/oneapi/setvars.sh" >> /root/.bashrc

diff --git a/docker/rocky9/Dockerfile b/docker/rocky9/Dockerfile
@@ -1,4 +1,6 @@
-FROM rockylinux/rockylinux:9.3
+# FROM rockylinux/rockylinux:9.3
+# FROM harbor.zetyun.cn/dingofs/dingo-eureka:rocky9
+FROM dingodatabase/dingo-eureka:rocky9
 
 ENV TZ=Asia/Shanghai
 SHELL ["/bin/bash", "-c"]
@@ -25,7 +27,7 @@ RUN dnf update -y  \
 # install rust
 # RUN wget https://sh.rustup.rs --content-disposition
 # RUN sh rustup-init.sh -y
-RUN wget https://static.rust-lang.org/dist/rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && xz -d rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && tar -xf rust-1.78.0-x86_64-unknown-linux-gnu.tar && cd rust-1.78.0-x86_64-unknown-linux-gnu && sh install.sh --prefix=/opt/rust/ && cd ../../ && rm -rf rust-1.78.0-x86_64-unknown-linux-gnu*
+RUN wget https://static.rust-lang.org/dist/rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && xz -d rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && tar -xf rust-1.78.0-x86_64-unknown-linux-gnu.tar && cd rust-1.78.0-x86_64-unknown-linux-gnu && sh install.sh --prefix=/opt/rust/ && cd .. && rm -rf rust-1.78.0-x86_64-unknown-linux-gnu*
 
 # soure env
 RUN echo "source /opt/intel/oneapi/setvars.sh" >> /root/.bashrc

diff --git a/docker/ubuntu22/Dockerfile b/docker/ubuntu22/Dockerfile
@@ -1,4 +1,5 @@
-FROM ubuntu:22.04
+# FROM ubuntu:22.04
+FROM dingodatabase/dingo-eureka:ubuntu2204
 
 ENV TZ=Asia/Shanghai \
     DEBIAN_FRONTEND=noninteractive
@@ -17,13 +18,15 @@ RUN chmod 777 /tmp && apt-get update  \
     && wget https://cmake.org/files/v3.25/cmake-3.25.2.tar.gz --no-check-certificate && tar -zxvf cmake-3.25.2.tar.gz && rm -f cmake-3.25.2.tar.gz && cd cmake-3.25.2 && ./bootstrap && make -j$(nproc) && make install && cd .. && rm -rf cmake-3.25.2
 
 # install rust
-RUN wget https://sh.rustup.rs --content-disposition
-RUN sh rustup-init.sh -y
+# RUN wget https://sh.rustup.rs --content-disposition
+# RUN sh rustup-init.sh -y && source $HOME/.cargo/env && rustup default stable
+RUN wget https://static.rust-lang.org/dist/rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && xz -d rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && tar -xf rust-1.78.0-x86_64-unknown-linux-gnu.tar && cd rust-1.78.0-x86_64-unknown-linux-gnu && sh install.sh --prefix=/opt/rust/ && cd .. && rm -rf rust-1.78.0-x86_64-unknown-linux-gnu*
+
 
 # soure env
 RUN echo "source /opt/intel/oneapi/setvars.sh" >> /root/.bashrc
 
-ENV PATH="/root/.cargo/bin:/opt/intel/oneapi:$PATH"
+ENV PATH=/opt/rust/bin:/root/.cargo/bin:/opt/intel/oneapi:$PATH
 
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
 

diff --git a/docker/ubuntu24/Dockerfile b/docker/ubuntu24/Dockerfile
@@ -1,4 +1,5 @@
-FROM ubuntu:24.04
+# FROM ubuntu:24.04
+FROM dingodatabase/dingo-eureka:ubuntu2404
 
 ENV TZ=Asia/Shanghai \
     DEBIAN_FRONTEND=noninteractive
@@ -17,13 +18,14 @@ RUN apt-get update \
     && wget https://cmake.org/files/v3.25/cmake-3.25.2.tar.gz --no-check-certificate && tar -zxvf cmake-3.25.2.tar.gz && rm -f cmake-3.25.2.tar.gz && cd cmake-3.25.2 && ./bootstrap && make -j$(nproc) && make install && cd .. && rm -rf cmake-3.25.2
 
 # install rust
-RUN wget https://sh.rustup.rs --content-disposition
-RUN sh rustup-init.sh -y
+# RUN wget https://sh.rustup.rs --content-disposition
+# RUN sh rustup-init.sh -y
+RUN wget https://static.rust-lang.org/dist/rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && xz -d rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz && tar -xf rust-1.78.0-x86_64-unknown-linux-gnu.tar && cd rust-1.78.0-x86_64-unknown-linux-gnu && sh install.sh --prefix=/opt/rust/ && cd .. && rm -rf rust-1.78.0-x86_64-unknown-linux-gnu*
 
 # soure env
 RUN echo "source /opt/intel/oneapi/setvars.sh" >> /root/.bashrc
 
-ENV PATH="/root/.cargo/bin:/opt/intel/oneapi:$PATH"
+ENV PATH=/opt/rust/bin:/root/.cargo/bin:/opt/intel/oneapi:$PATH
 
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/