From 85bb983c3ca4bf6a15cbbfdcacaf9a50df43eb23 Mon Sep 17 00:00:00 2001 From: ngxson Date: Wed, 31 Jan 2024 00:09:46 +0100 Subject: [PATCH] fix vulkan dockerfile --- .devops/main-vulkan.Dockerfile | 8 +++++--- .devops/server-vulkan.Dockerfile | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.devops/main-vulkan.Dockerfile b/.devops/main-vulkan.Dockerfile index 14a4d9e4f..bca460365 100644 --- a/.devops/main-vulkan.Dockerfile +++ b/.devops/main-vulkan.Dockerfile @@ -12,15 +12,17 @@ RUN wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | apt-key apt-get install -y vulkan-sdk # Build it +WORKDIR /app COPY . . RUN mkdir build && \ cd build && \ cmake .. -DLLAMA_VULKAN=1 && \ cmake --build . --config Release --target main -FROM ubuntu:$UBUNTU_VERSION as runtime - -COPY --from=build /app/build/bin/main /main +# Clean up +WORKDIR / +RUN cp /app/build/bin/main /main && \ + rm -rf /app ENV LC_ALL=C.utf8 diff --git a/.devops/server-vulkan.Dockerfile b/.devops/server-vulkan.Dockerfile index 2c13f0f8b..e0add6fc3 100644 --- a/.devops/server-vulkan.Dockerfile +++ b/.devops/server-vulkan.Dockerfile @@ -12,15 +12,17 @@ RUN wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | apt-key apt-get install -y vulkan-sdk # Build it +WORKDIR /app COPY . . RUN mkdir build && \ cd build && \ cmake .. -DLLAMA_VULKAN=1 && \ cmake --build . --config Release --target server -FROM ubuntu:$UBUNTU_VERSION as runtime - -COPY --from=build /app/build/bin/server /server +# Clean up +WORKDIR / +RUN cp /app/build/bin/server /server && \ + rm -rf /app ENV LC_ALL=C.utf8