From 76b019a7608850d12d48be7b63e87b06d422ea0e Mon Sep 17 00:00:00 2001
From: Art Matsak <5328078+artmatsak@users.noreply.github.com>
Date: Mon, 16 Dec 2024 16:16:21 +0100
Subject: [PATCH] Update Docker base image and system libraries

---
 backend/Dockerfile                   | 10 +++++-----
 backend/Dockerfile.model_server      |  4 ++--
 backend/tests/integration/Dockerfile | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index eaea8604a3c..2752d692e1c 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11.7-slim-bookworm
+FROM python:3.11.11-slim-bookworm
 
 LABEL com.danswer.maintainer="founders@onyx.app"
 LABEL com.danswer.description="This image is the web/frontend container of Onyx which \
@@ -27,10 +27,10 @@ RUN apt-get update && \
         zip \
         ca-certificates \
         libgnutls30=3.7.9-2+deb12u3 \
-        libblkid1=2.38.1-5+deb12u1 \
-        libmount1=2.38.1-5+deb12u1 \
-        libsmartcols1=2.38.1-5+deb12u1 \
-        libuuid1=2.38.1-5+deb12u1 \
+        libblkid1=2.38.1-5+deb12u2 \
+        libmount1=2.38.1-5+deb12u2 \
+        libsmartcols1=2.38.1-5+deb12u2 \
+        libuuid1=2.38.1-5+deb12u2 \
         libxmlsec1-dev \
         pkg-config \
         gcc && \
diff --git a/backend/Dockerfile.model_server b/backend/Dockerfile.model_server
index da62eddf305..12e6390a988 100644
--- a/backend/Dockerfile.model_server
+++ b/backend/Dockerfile.model_server
@@ -1,4 +1,4 @@
-FROM python:3.11.7-slim-bookworm
+FROM python:3.11.11-slim-bookworm
 
 LABEL com.danswer.maintainer="founders@onyx.app"
 LABEL com.danswer.description="This image is for the Onyx model server which runs all of the \
@@ -20,7 +20,7 @@ RUN pip install --no-cache-dir --upgrade \
         --timeout 30 \
         -r /tmp/requirements.txt
 
-RUN apt-get remove -y --allow-remove-essential perl-base && \ 
+RUN apt-get remove -y --allow-remove-essential perl-base && \
     apt-get autoremove -y
 
 # Pre-downloading models for setups with limited egress
diff --git a/backend/tests/integration/Dockerfile b/backend/tests/integration/Dockerfile
index 12e63a9b946..0580f3e5132 100644
--- a/backend/tests/integration/Dockerfile
+++ b/backend/tests/integration/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11.7-slim-bookworm
+FROM python:3.11.11-slim-bookworm
 # Dockerfile for integration tests
 # Currently needs all dependencies, since the ITs use some of the Onyx
 # backend code.
@@ -16,10 +16,10 @@ RUN apt-get update && \
         zip \
         ca-certificates \
         libgnutls30=3.7.9-2+deb12u3 \
-        libblkid1=2.38.1-5+deb12u1 \
-        libmount1=2.38.1-5+deb12u1 \
-        libsmartcols1=2.38.1-5+deb12u1 \
-        libuuid1=2.38.1-5+deb12u1 \
+        libblkid1=2.38.1-5+deb12u2 \
+        libmount1=2.38.1-5+deb12u2 \
+        libsmartcols1=2.38.1-5+deb12u2 \
+        libuuid1=2.38.1-5+deb12u2 \
         libxmlsec1-dev \
         pkg-config \
         gcc && \
@@ -84,4 +84,4 @@ COPY ./tests/integration /app/tests/integration
 ENV PYTHONPATH=/app
 
 ENTRYPOINT ["pytest", "-s"]
-CMD ["/app/tests/integration", "--ignore=/app/tests/integration/multitenant_tests"]
\ No newline at end of file
+CMD ["/app/tests/integration", "--ignore=/app/tests/integration/multitenant_tests"]