From 0e24747cb6e30076d183f26b6a4b244389bbe7fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Trifir=C3=B2?= <dtrifiro@redhat.com>
Date: Tue, 23 Apr 2024 16:57:59 +0200
Subject: [PATCH] Dockerfile.ubi: get rid of --link flags for COPY operations

not supported by openshift CI (buildah)

See https://github.com/containers/buildah/issues/4325
---
 Dockerfile.ubi | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.ubi b/Dockerfile.ubi
index d80691e563f59..afb2e6de006ef 100644
--- a/Dockerfile.ubi
+++ b/Dockerfile.ubi
@@ -43,7 +43,7 @@ RUN curl -fsSL -o ~/miniforge3.sh -O  "https://github.com/conda-forge/miniforge/
 ## Python Base #################################################################
 FROM base as python-base
 
-COPY --from=python-install --link /opt/vllm /opt/vllm
+COPY --from=python-install /opt/vllm /opt/vllm
 
 ENV PATH=/opt/vllm/bin/:$PATH
 
@@ -132,7 +132,7 @@ RUN ldconfig /usr/local/cuda-12.2/compat/
 ## Development #################################################################
 FROM cuda-devel AS dev
 
-COPY --from=python-torch-base --link /opt/vllm /opt/vllm
+COPY --from=python-torch-base /opt/vllm /opt/vllm
 ENV PATH=/opt/vllm/bin/:$PATH
 
 # install build and runtime dependencies
@@ -260,9 +260,9 @@ FROM base AS vllm
 
 WORKDIR /vllm-staging
 # COPY files from various places into a staging directory
-COPY --link vllm vllm
-COPY --from=build --link /workspace/vllm/*.so vllm/
-COPY --from=gen-protos --link /workspace/vllm/entrypoints/grpc/pb vllm/entrypoints/grpc/pb
+COPY vllm vllm
+COPY --from=build /workspace/vllm/*.so vllm/
+COPY --from=gen-protos /workspace/vllm/entrypoints/grpc/pb vllm/entrypoints/grpc/pb
 
 # custom COPY command to use umask to control permissions and grant permissions
 # to the group
@@ -281,7 +281,7 @@ FROM cuda-runtime AS vllm-openai
 WORKDIR /workspace
 
 # Create release python environment
-COPY --from=python-torch-base --link /opt/vllm /opt/vllm
+COPY --from=python-torch-base /opt/vllm /opt/vllm
 ENV PATH=/opt/vllm/bin/:$PATH
 
 RUN --mount=type=cache,target=/root/.cache/pip \
@@ -301,7 +301,7 @@ RUN --mount=type=bind,from=flash-attn-builder,src=/usr/src/flash-attention-v2,ta
     pip3 install /usr/src/flash-attention-v2/*.whl --no-cache-dir
 
 # vLLM will not be installed in site-packages
-COPY --from=vllm --link /workspace/ ./
+COPY --from=vllm /workspace/ ./
 
 # Triton needs a CC compiler
 RUN microdnf install -y gcc \