Addressed review comments.

Signed-off-by: Yurii Hordynskyi <[email protected]>
opencomputeproject · Nov 28, 2024 · 812f565 · 812f565
1 parent 9af26bc
commit 812f565
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/build.sh b/build.sh
@@ -145,14 +145,6 @@ print-build-options() {
 
 trap print-build-options EXIT
 
-# Link the pip configuration file to copy to the Docker image
-if [ "${BASE_OS}" = "bookworm" ]; then
-    rm -f pip.conf
-    if [ -f dockerfiles/${BASE_OS}/pip.conf ]; then
-        ln -s dockerfiles/${BASE_OS}/pip.conf pip.conf
-    fi
-fi
-
 # Build base Docker image
 if [ "${IMAGE_TYPE}" = "standalone" ]; then
     docker build -f dockerfiles/${BASE_OS}/Dockerfile -t sc-base:${BASE_OS} .

diff --git a/dockerfiles/bookworm/Dockerfile b/dockerfiles/bookworm/Dockerfile
@@ -3,8 +3,10 @@ FROM debian:bookworm-slim
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Copy the pip.conf file
-COPY pip.conf /root/.config/pip/pip.conf
+# Generate the pip configuration file
+RUN mkdir -p /root/.config/pip \
+        && echo "[global]" > /root/.config/pip/pip.conf \
+        && echo "break-system-packages = true" >> /root/.config/pip/pip.conf
 
 # Install generic packages
 RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \

diff --git a/dockerfiles/bookworm/Dockerfile.client b/dockerfiles/bookworm/Dockerfile.client
@@ -3,8 +3,10 @@ FROM debian:bookworm-slim
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Copy the pip.conf file
-COPY pip.conf /root/.config/pip/pip.conf
+# Generate the pip configuration file
+RUN mkdir -p /root/.config/pip \
+        && echo "[global]" > /root/.config/pip/pip.conf \
+        && echo "break-system-packages = true" >> /root/.config/pip/pip.conf
 
 # Install generic packages
 RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \

diff --git a/dockerfiles/bookworm/Dockerfile.saithrift-client b/dockerfiles/bookworm/Dockerfile.saithrift-client
@@ -1,7 +1,9 @@
 FROM sc-client:bookworm
 
-# Copy the pip.conf file
-COPY pip.conf /root/.config/pip/pip.conf
+# Generate the pip configuration file
+RUN mkdir -p /root/.config/pip \
+        && echo "[global]" > /root/.config/pip/pip.conf \
+        && echo "break-system-packages = true" >> /root/.config/pip/pip.conf
 
 ENV SAIGEN_DEPS    libgetopt-long-descriptive-perl libconst-fast-perl \
                    libtemplate-perl libnamespace-autoclean-perl \

diff --git a/dockerfiles/bookworm/Dockerfile.saithrift-server b/dockerfiles/bookworm/Dockerfile.saithrift-server
@@ -3,8 +3,10 @@ FROM debian:bookworm-slim
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Copy the pip.conf file
-COPY pip.conf /root/.config/pip/pip.conf
+# Generate the pip configuration file
+RUN mkdir -p /root/.config/pip \
+        && echo "[global]" > /root/.config/pip/pip.conf \
+        && echo "break-system-packages = true" >> /root/.config/pip/pip.conf
 
 COPY sai.env /
 

diff --git a/dockerfiles/bookworm/Dockerfile.server b/dockerfiles/bookworm/Dockerfile.server
@@ -3,8 +3,10 @@ FROM debian:bookworm-slim
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Copy the pip.conf file
-COPY pip.conf /root/.config/pip/pip.conf
+# Generate the pip configuration file
+RUN mkdir -p /root/.config/pip \
+        && echo "[global]" > /root/.config/pip/pip.conf \
+        && echo "break-system-packages = true" >> /root/.config/pip/pip.conf
 
 # Install generic packages
 RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \