Merge pull request 'Merge changes from master' (#25) from master into nightly

Reviewed-on: #25
This commit is contained in:
Exynox 2024-05-25 17:55:22 +03:00
commit 27108d629a
1 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
FROM ubuntu:latest as build FROM ubuntu:22.04 as build
WORKDIR /app WORKDIR /app
# Update the system and install various dependencies # Update the system and install various dependencies
@ -21,7 +21,7 @@ RUN mkdir build/
RUN cd build && cmake -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake .. RUN cd build && cmake -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ..
RUN cd build && make -j $(nproc) RUN cd build && make -j $(nproc)
FROM ubuntu:latest as app FROM ubuntu:22.04 as app
WORKDIR /app WORKDIR /app
RUN apt-get update && apt-get install -y python2 libdevil-dev libbsd-dev && apt-get clean RUN apt-get update && apt-get install -y python2 libdevil-dev libbsd-dev && apt-get clean