From 1a26fcfbf10c71f0ef8e46aa38184c3803e57478 Mon Sep 17 00:00:00 2001
From: Prashant Gupta <prashantgupta24@gmail.com>
Date: Tue, 25 Jun 2024 05:17:36 -0700
Subject: [PATCH 1/2] Dockerfile.ubi: use tensorizer (#64)

add libsodium for tensorizer encryption

---------

Signed-off-by: Prashant Gupta <prashantgupta@us.ibm.com>
Co-authored-by: Daniele <36171005+dtrifiro@users.noreply.github.com>
---
 Dockerfile.ubi | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.ubi b/Dockerfile.ubi
index e4861243e222..cef224e3e8bb 100644
--- a/Dockerfile.ubi
+++ b/Dockerfile.ubi
@@ -125,6 +125,22 @@ RUN --mount=type=cache,target=/root/.cache/ccache \
         CMAKE_BUILD_TYPE=Release \
         python3 setup.py bdist_wheel --dist-dir=dist
 
+#################### libsodium Build IMAGE ####################
+FROM base as libsodium-builder
+
+RUN microdnf install -y gcc gzip \
+    && microdnf clean all
+
+WORKDIR /usr/src/libsodium
+
+ARG LIBSODIUM_VERSION=1.0.20
+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 ./configure --prefix="/usr/" && make && make check
+
 ## Release #####################################################################
 FROM python-install AS vllm-openai
 
@@ -143,7 +159,12 @@ COPY extras/custom_cache_manager.py /opt/vllm/lib/python3.11/site-packages/custo
 # install vllm wheel first, so that torch etc will be installed
 RUN --mount=type=bind,from=build,src=/workspace/dist,target=/workspace/dist \
     --mount=type=cache,target=/root/.cache/pip \
-    pip install dist/*.whl --verbose
+    pip install $(echo dist/*.whl)'[tensorizer]' --verbose
+
+# Install libsodium for Tensorizer encryption
+RUN --mount=type=bind,from=libsodium-builder,src=/usr/src/libsodium,target=/usr/src/libsodium \
+    cd /usr/src/libsodium \
+    && make install
 
 ENV HF_HUB_OFFLINE=1 \
     PORT=8000 \

From 1f397596c47be0e64095c3cfdb32d92499105afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Trifir=C3=B2?= <dtrifiro@redhat.com>
Date: Wed, 26 Jun 2024 18:13:16 +0200
Subject: [PATCH 2/2] Dockerfile.ubi: pin vllm-tgis-adapter to 0.1.2

---
 Dockerfile.ubi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.ubi b/Dockerfile.ubi
index cef224e3e8bb..20bb7e7e2cb5 100644
--- a/Dockerfile.ubi
+++ b/Dockerfile.ubi
@@ -189,7 +189,7 @@ FROM vllm-openai as vllm-grpc-adapter
 USER root
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-    pip install vllm-tgis-adapter
+    pip install vllm-tgis-adapter==0.1.2
 
 ENV GRPC_PORT=8033
 USER 2000