diff --git a/Makefile b/Makefile index 318a5b056..21c9fe330 100644 --- a/Makefile +++ b/Makefile @@ -177,7 +177,7 @@ create_linux_release: # This command uses act to replicate github action # https://github.com/nektos/act run_ci: - act -P ubuntu-18.04=nektos/act-environments-ubuntu:18.04 + act ####### General project commands ####### diff --git a/docker-builders/Makefile b/docker-builders/Makefile index 11a8344b4..ef79b4dfc 100644 --- a/docker-builders/Makefile +++ b/docker-builders/Makefile @@ -2,18 +2,18 @@ build_kompute_builder: docker build .. -f KomputeBuilder.Dockerfile -t axsauze/kompute-builder:0.2 -push_kompute_builder: +push_kompute_builder: build_kompute_builder docker push axsauze/kompute-builder:0.2 build_swiftshader: docker build .. -f Swiftshader.Dockerfile -t axsauze/swiftshader:0.1 -push_swiftshader: +push_swiftshader: build_swiftshader docker push axsauze/swiftshader:0.1 build_vulkan_sdk: docker build .. -f VulkanSDK.Dockerfile -t axsauze/vulkan-sdk:0.1 -push_vulkan_sdk: +push_vulkan_sdk: build_vulkan_sdk docker push axsauze/vulkan-sdk:0.1 diff --git a/docker-builders/Swiftshader.Dockerfile b/docker-builders/Swiftshader.Dockerfile index b942e0bab..1e492beac 100644 --- a/docker-builders/Swiftshader.Dockerfile +++ b/docker-builders/Swiftshader.Dockerfile @@ -30,5 +30,5 @@ RUN apt-get install -y libxext-dev RUN git clone https://github.com/google/swiftshader swiftshader-build RUN CC="/usr/bin/gcc-8" CXX="/usr/bin/g++-8" cmake swiftshader-build/. -Bswiftshader-build/build/ RUN cmake --build swiftshader-build/build/. --parallel 12 -COPY swiftshader-build/build/Linux/ swiftshader/ +RUN cp -r swiftshader-build/build/Linux/ swiftshader/