Merge branch 'dev' into s/feat/spawn-llama-cpp

Author: vansangpfiev

docker/Dockerfile

@@ -24,7 +24,6 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
     apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
-    cmake \
     make \
     git \
     uuid-dev \
@@ -37,11 +36,21 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
     ninja-build \
     pkg-config \
     python3-pip \
-    openssl && \
+    openssl \
+    libssl-dev && \
     pip3 install awscli && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Download and install CMake 3.22.6
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.6/cmake-3.22.6.tar.gz -q -O /tmp/cmake.tar.gz && \
+    tar -xzf /tmp/cmake.tar.gz -C /tmp && \
+    cd /tmp/cmake-3.22.6 && \
+    ./bootstrap && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf /tmp/cmake.tar.gz /tmp/cmake-3.22.6
+
 ARG CORTEX_CPP_VERSION=latest
 ARG CMAKE_EXTRA_FLAGS=""
 

docker/Dockerfile.cache

@@ -24,7 +24,6 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
     apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
-    cmake \
     make \
     git \
     uuid-dev \
@@ -37,11 +36,21 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
     ninja-build \
     pkg-config \
     python3-pip \
-    openssl && \
+    openssl \
+    libssl-dev && \
     pip3 install awscli && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Download and install CMake 3.22.6
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.6/cmake-3.22.6.tar.gz -q -O /tmp/cmake.tar.gz && \
+    tar -xzf /tmp/cmake.tar.gz -C /tmp && \
+    cd /tmp/cmake-3.22.6 && \
+    ./bootstrap && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf /tmp/cmake.tar.gz /tmp/cmake-3.22.6
+
 ARG CORTEX_CPP_VERSION=latest
 ARG CMAKE_EXTRA_FLAGS=""