From 0caca67ee13fc16a25c88885725eb2863269a4a3 Mon Sep 17 00:00:00 2001
From: Hansyangxingxiang <846397920@qq.com>
Date: Tue, 25 Mar 2025 17:47:59 +0800
Subject: [PATCH] fix_dockerfile build failed (#208)

Co-authored-by: yangxingxiang <hansyang@yunify.com>
---
 dockerfile/dev.dockerfile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/dockerfile/dev.dockerfile b/dockerfile/dev.dockerfile
index edeb8c2..06c7beb 100644
--- a/dockerfile/dev.dockerfile
+++ b/dockerfile/dev.dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update                                    &&\
   apt-get install -y --no-install-recommends            \
   git wget ca-certificates                              \
   clang-format-14 clang-14 clang-tidy-14 lld-14         \
-  build-essential meson gcc-12 g++-12 cmake rustc cargo \
+  build-essential meson gcc-12 g++-12 cmake             \
   google-perftools                                      \
   libaio-dev                                            \
   libboost-all-dev                                      \
@@ -24,21 +24,17 @@ RUN apt-get update                                    &&\
   apt-get clean                                       &&\
   rm -rf /var/lib/apt/lists/*
 
-  ARG TARGETARCH
-  ARG FDB_VERSION=7.3.63
-  ARG FDB_ARCH_SUFFIX
-  RUN case "${TARGETARCH}" in \
-      amd64) FDB_ARCH_SUFFIX="amd64" ;; \
-      arm64) FDB_ARCH_SUFFIX="aarch64" ;; \
-      *) echo "Unsupported architecture: ${TARGETARCH}"; exit 1 ;; \
+ARG FDB_VERSION=7.3.63
+RUN FDB_ARCH_SUFFIX=$(dpkg --print-architecture) && \
+    case "${FDB_ARCH_SUFFIX}" in \
+      amd64) ;; \
+      arm64) FDB_ARCH_SUFFIX="aarch64" ;; \ 
+      *) echo "Unsupported architecture: ${FDB_ARCH_SUFFIX}"; exit 1 ;; \
       esac && \
       FDB_CLIENT_URL="https://github.com/apple/foundationdb/releases/download/${FDB_VERSION}/foundationdb-clients_${FDB_VERSION}-1_${FDB_ARCH_SUFFIX}.deb" && \
-      FDB_SERVER_URL="https://github.com/apple/foundationdb/releases/download/${FDB_VERSION}/foundationdb-server_${FDB_VERSION}-1_${FDB_ARCH_SUFFIX}.deb" && \
       wget -q "${FDB_CLIENT_URL}" && \
-      wget -q "${FDB_SERVER_URL}" && \
       dpkg -i foundationdb-clients_${FDB_VERSION}-1_${FDB_ARCH_SUFFIX}.deb && \
-      dpkg -i foundationdb-server_${FDB_VERSION}-1_${FDB_ARCH_SUFFIX}.deb && \
-      rm foundationdb-clients_${FDB_VERSION}-1_${FDB_ARCH_SUFFIX}.deb foundationdb-server_${FDB_VERSION}-1_${FDB_ARCH_SUFFIX}.deb
+      rm foundationdb-clients_${FDB_VERSION}-1_${FDB_ARCH_SUFFIX}.deb
 
 ARG LIBFUSE_VERSION=3.16.2
 ARG LIBFUSE_DOWNLOAD_URL=https://github.com/libfuse/libfuse/releases/download/fuse-${LIBFUSE_VERSION}/fuse-${LIBFUSE_VERSION}.tar.gz
@@ -48,4 +44,8 @@ RUN wget -O- ${LIBFUSE_DOWNLOAD_URL}        |\
   mkdir build && cd build                  &&\
   meson setup .. && meson configure -D default_library=both &&\
   ninja && ninja install &&\
-  rm -f -r /tmp/fuse-${LIBFUSE_VERSION}*
\ No newline at end of file
+  rm -f -r /tmp/fuse-${LIBFUSE_VERSION}*
+
+# Install Rust
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
\ No newline at end of file