diff --git a/Jenkinsfile b/Jenkinsfile index 4960aa4..34d5419 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,6 +48,10 @@ node { sh 'cp -vf $HOME/rpi_image/sysroot.tar.bz2 ./pi/' } } + + docker.build("${env.DOCKER_PREFIX}/windows-base", "./windows-base ${docker_cache_arg}") + docker.build("${env.DOCKER_PREFIX}/windows-base-32", "./windows-base-env32 ${docker_cache_arg}") + docker.build("${env.DOCKER_PREFIX}/windows-base-64", "./windows-base-env64 ${docker_cache_arg}") pl.forEach ({ dist -> def args = "./${dist.docker.directory} ${docker_cache_arg}" diff --git a/debian-base/Dockerfile b/debian-base/Dockerfile index dd50ef1..9112629 100644 --- a/debian-base/Dockerfile +++ b/debian-base/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y subversion git zip unzip wget curl htop # last cmake from sources, into /opt ENV CUR_CMAKE_VERSION=3.20.0 WORKDIR /soft -RUN wget -nv https://github.com/Kitware/CMake/releases/download/v${CUR_CMAKE_VERSION}/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \ +RUN wget -nv https://shstk.ru/files/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \ && mkdir -p /opt/cmake \ && bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/opt/cmake \ && rm -rf /soft/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh diff --git a/linux_cross/Dockerfile b/linux_cross/Dockerfile index 0a333a6..eb53d12 100644 --- a/linux_cross/Dockerfile +++ b/linux_cross/Dockerfile @@ -40,7 +40,7 @@ RUN ln -s /usr/lib/os-release /soft/target/lib/os-release # last cmake from sources, into /opt WORKDIR /soft -RUN wget -nv https://github.com/Kitware/CMake/releases/download/v${CUR_CMAKE_VERSION}/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \ +RUN wget -nv https://shstk.ru/files/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \ && mkdir -p /opt/cmake \ && bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/opt/cmake \ && rm -rf /soft/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh diff --git a/linux_desktop/Dockerfile b/linux_desktop/Dockerfile index 08b6737..0422233 100644 --- a/linux_desktop/Dockerfile +++ b/linux_desktop/Dockerfile @@ -40,7 +40,7 @@ RUN rm /soft/*.sh -v # last cmake from sources, into /opt WORKDIR /soft -RUN wget -nv https://github.com/Kitware/CMake/releases/download/v${CUR_CMAKE_VERSION}/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \ +RUN wget -nv https://shstk.ru/files/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \ && mkdir -p /opt/cmake \ && bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/opt/cmake \ && rm -rf /soft/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh diff --git a/windows-base/Dockerfile b/windows-base/Dockerfile index 340d7b5..4a75f0a 100644 --- a/windows-base/Dockerfile +++ b/windows-base/Dockerfile @@ -33,7 +33,7 @@ RUN apt-get update && apt-get install -y cpio libglu1-mesa-dev libgl1-mesa-dev l && rm -rf /var/cache/apt/archives/* WORKDIR /soft -RUN wget -v https://github.com/Kitware/CMake/releases/download/v${CUR_CMAKE_VERSION}/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \ +RUN wget -v https://shstk.ru/files/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \ && rm -rf /opt/cmake \ && mkdir -p /opt/cmake \ && bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/opt/cmake \ diff --git a/windows-clang/Dockerfile b/windows-clang/Dockerfile index a1d8f45..fbca21e 100644 --- a/windows-clang/Dockerfile +++ b/windows-clang/Dockerfile @@ -54,7 +54,7 @@ RUN unzip -o opencl_win.zip -d /soft/windows \ # last cmake from sources, into /opt ENV CUR_CMAKE_VERSION=3.31.3 -RUN wget -nv https://github.com/Kitware/CMake/releases/download/v${CUR_CMAKE_VERSION}/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \ +RUN wget -nv https://shstk.ru/files/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \ && mkdir -p /opt/cmake \ && bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/opt/cmake \ && rm -rf /soft/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh