ci: rework toolchain Dockerfile

Mizux · Dec 10, 2024 · 16393d6 · 16393d6
1 parent 8c9b212
commit 16393d6
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/cmake/ci/docker/toolchain/Dockerfile b/cmake/ci/docker/toolchain/Dockerfile
@@ -5,25 +5,22 @@ LABEL maintainer="[email protected]"
 # Install system build dependencies
 ENV PATH=/usr/local/bin:$PATH
 RUN apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -yq git wget libssl-dev build-essential \
- ninja-build python3 python3-venv pkgconf libglib2.0-dev \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -yq \
+ git wget libssl-dev \
+ build-essential cmake ninja-build \
+ python3 python3-venv \
+ pkgconf libglib2.0-dev \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 ENTRYPOINT ["/usr/bin/bash", "-c"]
 CMD ["/usr/bin/bash"]
 
-# Install CMake 3.21.3
-RUN wget "https://cmake.org/files/v3.21/cmake-3.21.3-linux-x86_64.sh" \
-&& chmod a+x cmake-3.21.3-linux-x86_64.sh \
-&& ./cmake-3.21.3-linux-x86_64.sh --prefix=/usr/local/ --skip-license \
-&& rm cmake-3.21.3-linux-x86_64.sh
-
 FROM env AS devel
 WORKDIR /home/project
 COPY . .
 
 ARG TARGET
-ENV TARGET ${TARGET:-unknown}
+ENV TARGET=${TARGET:-unknown}
 
 FROM devel AS build
 RUN cmake -version