diff --git a/Dockerfile b/Dockerfile index 23cfdc3..1573471 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,13 @@ RUN apt-get update -qq && apt-get install -qqy --no-install-recommends \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* +RUN cd /opt && \ + wget https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2-Linux-x86_64.tar.gz && \ + tar -zxvf cmake-*.tar.gz && \ + rm cmake-*.tar.gz && \ + mv cmake-* cmake +ENV PATH=/opt/cmake/bin:$PATH + RUN git config --global user.name "LLVM MinGW" && \ git config --global user.email root@localhost diff --git a/Dockerfile.cross b/Dockerfile.cross index 7375774..3d79cea 100644 --- a/Dockerfile.cross +++ b/Dockerfile.cross @@ -16,13 +16,6 @@ RUN apt-get update -qq && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* -RUN cd /opt && \ - wget https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2-Linux-x86_64.tar.gz && \ - tar -zxvf cmake-*.tar.gz && \ - rm cmake-*.tar.gz && \ - mv cmake-* cmake -ENV PATH=/opt/cmake/bin:$PATH - ARG CROSS_ARCH=x86_64 ENV CROSS_TOOLCHAIN_PREFIX=/opt/llvm-mingw-$CROSS_ARCH diff --git a/Dockerfile.dev b/Dockerfile.dev index 852e9a3..4ad2a13 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -7,6 +7,13 @@ RUN apt-get update -qq && apt-get install -qqy --no-install-recommends \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* +RUN cd /opt && \ + wget https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2-Linux-x86_64.tar.gz && \ + tar -zxvf cmake-*.tar.gz && \ + rm cmake-*.tar.gz && \ + mv cmake-* cmake +ENV PATH=/opt/cmake/bin:$PATH + RUN git config --global user.name "LLVM MinGW" && \ git config --global user.email root@localhost