Merge remote-tracking branch 'nm-fork/main' into sync-v0.9.2

Author: heyselbi

Dockerfile.rocm.ubi

@@ -71,27 +71,6 @@ WORKDIR /opt/rocm/share/amd_smi
 
 RUN python setup.py bdist_wheel --dist-dir=/dist/
 
-#################### libsodium Build IMAGE ####################
-FROM rocm_base as libsodium-builder
-
-RUN microdnf install -y --nodocs gcc gzip tar \
-    && microdnf clean all
-
-WORKDIR /usr/src/libsodium
-
-ARG LIBSODIUM_VERSION
-RUN curl -LO https://github.com/jedisct1/libsodium/releases/download/${LIBSODIUM_VERSION}-RELEASE/libsodium-${LIBSODIUM_VERSION}.tar.gz \
-    && tar -xzvf libsodium*.tar.gz \
-    && rm -f libsodium*.tar.gz \
-    && mv libsodium*/* ./
-
-RUN CFLAGS="-O3 -Wall -Werror=format-security -Wno-unused-function -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -fcf-protection" \
-    ./configure \
-        --prefix="/usr/" \
-        --libdir=/usr/lib64 && \
-    make -j $(nproc) && \
-    make check
-
 ##################################################################################################
 
 FROM rocm_base AS vllm-openai
@@ -107,10 +86,6 @@ ENV PATH=$VIRTUAL_ENV/bin:$PATH
 RUN microdnf install -y --setopt=install_weak_deps=0 --nodocs gcc rsync && \
     microdnf clean all
 
-# Install libsodium for Tensorizer encryption
-RUN --mount=type=bind,from=libsodium-builder,src=/usr/src/libsodium,target=/usr/src/libsodium \
-     make -C /usr/src/libsodium install
-
 RUN --mount=type=bind,from=build_amdsmi,src=/dist,target=/install/amdsmi/ \
     --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,src=payload,target=/workspace/payload \

Dockerfile.ubi

@@ -67,23 +67,6 @@ RUN --mount=type=cache,target=/root/.cache/uv \
         -r requirements-cuda.txt
 
 
-#################### libsodium Build IMAGE ####################
-FROM base AS libsodium-builder
-
-RUN microdnf install -y gcc gzip \
-    && microdnf clean all
-
-WORKDIR /usr/src/libsodium
-
-ARG LIBSODIUM_VERSION
-RUN curl -LO https://github.com/jedisct1/libsodium/releases/download/${LIBSODIUM_VERSION}-RELEASE/libsodium-${LIBSODIUM_VERSION}.tar.gz \
-    && tar -xzvf libsodium*.tar.gz \
-    && rm -f libsodium*.tar.gz \
-    && mv libsodium*/* ./
-
-RUN CFLAGS="-O3 -Wall -Werror=format-security -Wno-unused-function -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -fcf-protection"\
-    ./configure --prefix="/usr/" && make -j $MAX_JOBS && make check
-
 ## Release #####################################################################
 FROM python-install AS vllm-openai
 ARG PYTHON_VERSION
@@ -103,10 +86,6 @@ RUN microdnf install -y gcc && \
     microdnf clean all
 
 
-# Install libsodium for Tensorizer encryption
-RUN --mount=type=bind,from=libsodium-builder,src=/usr/src/libsodium,target=/usr/src/libsodium \
-    make -C /usr/src/libsodium install
-
 COPY LICENSE /licenses/vllm.md
 COPY examples/*.jinja /app/data/template/
 

docker-bake.hcl

@@ -61,7 +61,6 @@ target "cuda" {
 
   args = {
     PYTHON_VERSION = "${PYTHON_VERSION}"
-    LIBSODIUM_VERSION = "1.0.20"
     VLLM_TGIS_ADAPTER_VERSION = "${VLLM_TGIS_ADAPTER_VERSION}"
   }
 
@@ -80,7 +79,6 @@ target "rocm" {
   args = {
     PYTHON_VERSION = "${PYTHON_VERSION}"
     ROCM_VERSION = "${ROCM_VERSION}"
-    LIBSODIUM_VERSION = "1.0.20"
     VLLM_TGIS_ADAPTER_VERSION = "${VLLM_TGIS_ADAPTER_VERSION}"
   }