Add minio client (#81)

* Update Dockerfile.centos7 * Update Dockerfile.centos8 * Update Dockerfile.ubuntu
vesoft-inc · Feb 6, 2024 · 421a1a4 · 421a1a4
1 parent 452d2d9
commit 421a1a4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 12 deletions.
diff --git a/Dockerfile.centos7 b/Dockerfile.centos7
@@ -106,12 +106,19 @@ RUN git clone --branch master --single-branch https://github.com/linux-test-proj
 # fastcov
 RUN pip3 install --no-cache-dir fastcov
 
-# Install ossutil64
-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
+# Install ossutil
+RUN curl https://gosspublic.alicdn.com/ossutil/install.sh | bash
 
 #Install mold
 RUN mkdir /usr/local/mold && wget -qO- https://oss-cdn.nebula-graph.com.cn/toolset/mold/mold-1.10.1-$(uname -m)-linux.tar.gz | tar xzf - --strip-components=1 -C /usr/local/mold/ \
     && ln -snf  /opt/vesoft/toolset/gcc/9.3.0/lib64/libstdc++.so.6 /usr/lib64/libstdc++.so.6
 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/
diff --git a/Dockerfile.centos8 b/Dockerfile.centos8
@@ -104,11 +104,18 @@ RUN git clone --branch master --single-branch https://github.com/linux-test-proj
   && cd lcov && git checkout 75fbae1cfc5027f818a0bb865bf6f96fab3202da \
   && make install && cd ../ && rm -rf lcov
 
-# Install ossutil64
-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
+# 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/v1.10.1/mold-1.10.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/
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
@@ -97,11 +97,18 @@ RUN wget -qO- https://github.com/ccache/ccache/releases/download/v3.7.7/ccache-3
   && make install \
   && cd ../ && rm -rf ccache-*
 
-# Install ossutil64
-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
+# 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/v1.10.1/mold-1.10.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/