Updated dockefile
This commit is contained in:
parent
7c8c0eeba2
commit
23d6340c3f
2 changed files with 7 additions and 11 deletions
8
Makefile
8
Makefile
|
|
@ -125,7 +125,7 @@ vs_run_tests: vs_build_tests
|
|||
####### Create release ######
|
||||
|
||||
update_builder_image:
|
||||
docker build -f Dockerfile.linux . \
|
||||
docker build -f builders/Dockerfile.linux . \
|
||||
-t axsauze/kompute-builder:0.1
|
||||
docker push axsauze/kompute-builder:0.1
|
||||
|
||||
|
|
@ -152,12 +152,6 @@ build_shaders:
|
|||
--header-path test/compiled_shaders_include/kompute_test/shaders/ \
|
||||
-v
|
||||
|
||||
docker_vulkan_build:
|
||||
docker build . -t axsauze/vulkan-sum:0.1
|
||||
|
||||
push_vulkan_docker:
|
||||
docker push axsauze/vulkan-sum:0.1
|
||||
|
||||
build_single_header:
|
||||
quom \
|
||||
--include_directory \
|
||||
|
|
|
|||
|
|
@ -1,15 +1,17 @@
|
|||
FROM amd64/ubuntu:20.04
|
||||
|
||||
ARG VULKAN_SDK_VERSION=1.2.154.0
|
||||
|
||||
# First install vulkan
|
||||
RUN apt-get update
|
||||
RUN apt-get install -y curl unzip tar wget
|
||||
RUN wget -O VulkanSDK.tar.gz https://sdk.lunarg.com/sdk/download/1.2.141.2/linux/vulkansdk-linux-x86_64-1.2.141.2.tar.gz?u=true && \
|
||||
RUN wget -O VulkanSDK.tar.gz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?u=true && \
|
||||
mkdir VulkanSDK && \
|
||||
cd VulkanSDK && \
|
||||
tar xvf /VulkanSDK.tar.gz
|
||||
|
||||
RUN cd VulkanSDK/1.2.141.2
|
||||
ENV VULKAN_SDK="/VulkanSDK/1.2.141.2/x86_64"
|
||||
RUN cd VulkanSDK/${VULKAN_SDK_VERSION}
|
||||
ENV VULKAN_SDK="/VulkanSDK/${VULKAN_SDK_VERSION}/x86_64"
|
||||
ENV PATH="${VULKAN_SDK}/bin:${PATH}"
|
||||
ENV LD_LIBRARY_PATH="${VULKAN_SDK}/lib"
|
||||
ENV VK_LAYER_PATH="${VULKAN_SDK}/etc/explicit_layer.d"
|
||||
|
|
@ -53,7 +55,7 @@ ENV VCPKG_PATH=/core/vcpkg
|
|||
ENV VCPKG_ROOT=/core/vcpkg
|
||||
|
||||
# INstall dependencies for kompute
|
||||
RUN vcpkg install catch2 fmt spdlog vulkan
|
||||
RUN /core/vcpkg/vcpkg install fmt spdlog vulkan-headers gtest
|
||||
|
||||
RUN mkdir /workspace
|
||||
WORKDIR /workspace
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue