Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update docker to use ninja instead of make

Browse Source
This commit is contained in:
technyon
2024-02-25 17:52:47 +07:00
parent 57722d5b00
commit 13d26659d3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Docker/Dockerfile
View File

@@ -2,7 +2,7 @@ FROM eclipse-temurin:11-jdk-jammy AS builder
RUN set -ex && \ RUN set -ex && \
apt-get update && \ apt-get update && \
apt-get install -y git cmake xz-utils python3 python3-serial apt-get install -y git cmake xz-utils python3 python3-serial ninja-build
RUN curl -L "https://downloads.arduino.cc/arduino-1.8.19-linux64.tar.xz" -o /tmp/arduino-ide.tar.xz RUN curl -L "https://downloads.arduino.cc/arduino-1.8.19-linux64.tar.xz" -o /tmp/arduino-ide.tar.xz
RUN tar -xf /tmp/arduino-ide.tar.xz --directory ~/ RUN tar -xf /tmp/arduino-ide.tar.xz --directory ~/
@@ -37,8 +37,8 @@ RUN cd /usr/src/nuki_hub/build && \
RUN set -ex && \ RUN set -ex && \
cd /usr/src/nuki_hub/build && \ cd /usr/src/nuki_hub/build && \
touch file_opts && \ touch file_opts && \
cmake -D CMAKE_TOOLCHAIN_FILE=~/Arduino-CMake-Toolchain/Arduino-toolchain.cmake .. && \ cmake -G Ninja -D CMAKE_TOOLCHAIN_FILE=~/Arduino-CMake-Toolchain/Arduino-toolchain.cmake .. && \
make ninja
FROM builder AS runtime FROM builder AS runtime