feat(ci): Dockerfile update base images and post-install cleanup (abetlen#1530)

Smartappli · abetlen · web-flow · commit b77e5070291c · 2024-07-09T11:55:21.000-04:00
* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update build-docker.yaml

* Update Dockerfile

* Update Dockerfile

* Remove docker login

---------

Co-authored-by: Andrei Betlen &lt;abetlen@gmail.com&gt;
diff --git a/docker/cuda_simple/Dockerfile b/docker/cuda_simple/Dockerfile
@@ -1,4 +1,4 @@
-ARG CUDA_IMAGE="12.1.1-devel-ubuntu22.04"
+ARG CUDA_IMAGE="12.5.0-devel-ubuntu22.04"
 FROM nvidia/cuda:${CUDA_IMAGE}
 
 # We need to set the host to 0.0.0.0 to allow outside access
diff --git a/docker/open_llama/Dockerfile b/docker/open_llama/Dockerfile
@@ -1,5 +1,5 @@
 # Define the image argument and provide a default value
-ARG IMAGE=python:3-slim-bullseye
+ARG IMAGE=python:3-slim-bookworm
 
 # Use the image as specified
 FROM ${IMAGE}
@@ -12,7 +12,9 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco
     python3 \
     python3-pip \
     ninja-build \
-    build-essential
+    build-essential \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN python3 -m pip install --upgrade pip pytest cmake scikit-build setuptools fastapi uvicorn sse-starlette pydantic-settings starlette-context
 
diff --git a/docker/openblas_simple/Dockerfile b/docker/openblas_simple/Dockerfile
@@ -1,12 +1,15 @@
-FROM python:3-slim-bullseye
+FROM python:3-slim-bookworm
 
 # We need to set the host to 0.0.0.0 to allow outside access
 ENV HOST 0.0.0.0
 
 COPY . .
 
 # Install the package
-RUN apt update && apt install -y libopenblas-dev ninja-build build-essential pkg-config
+RUN apt update && apt install -y libopenblas-dev ninja-build build-essential pkg-config \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/*
+    
 RUN python -m pip install --upgrade pip pytest cmake scikit-build setuptools fastapi uvicorn sse-starlette pydantic-settings starlette-context
 
 RUN CMAKE_ARGS="-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS" pip install llama_cpp_python --verbose
diff --git a/docker/simple/Dockerfile b/docker/simple/Dockerfile
@@ -1,5 +1,5 @@
 # Define the image argument and provide a default value
-ARG IMAGE=python:3-slim-bullseye
+ARG IMAGE=python:3-slim-bookworm
 
 # Use the image as specified
 FROM ${IMAGE}
@@ -13,7 +13,9 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco
     python3-pip \
     ninja-build \
     libopenblas-dev \
-    build-essential
+    build-essential \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/*
 
 RUN mkdir /app
 WORKDIR /app

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG CUDA_IMAGE="12.1.1-devel-ubuntu22.04"`
	`1`	`+ARG CUDA_IMAGE="12.5.0-devel-ubuntu22.04"`
`2`	`2`	`FROM nvidia/cuda:${CUDA_IMAGE}`
`3`	`3`
`4`	`4`	`# We need to set the host to 0.0.0.0 to allow outside access`