SHS/docker
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'CMake download from shstk' (#1) from master into release
SHS Gitea/docker/pipeline/head Something is wrong with the build of this commit
Details

Browse Source 
Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
Пелипенко Иван
2026-05-07 16:19:20 +03:00
parent 20a6e43644 d203d1d4d0
commit cd50d2ac5b
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+4
View File
@@ -48,6 +48,10 @@ node {
sh 'cp -vf $HOME/rpi_image/sysroot.tar.bz2 ./pi/' 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 -> pl.forEach ({ dist ->
def args = "./${dist.docker.directory} ${docker_cache_arg}" def args = "./${dist.docker.directory} ${docker_cache_arg}"
debian-base/Dockerfile
+1 -1
View File
@@ -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 # last cmake from sources, into /opt
ENV CUR_CMAKE_VERSION=3.20.0 ENV CUR_CMAKE_VERSION=3.20.0
WORKDIR /soft 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 \ && mkdir -p /opt/cmake \
&& bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/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 && rm -rf /soft/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh
linux_cross/Dockerfile
+1 -1
View File
@@ -40,7 +40,7 @@ RUN ln -s /usr/lib/os-release /soft/target/lib/os-release
# last cmake from sources, into /opt # last cmake from sources, into /opt
WORKDIR /soft 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 \ && mkdir -p /opt/cmake \
&& bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/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 && rm -rf /soft/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh
linux_desktop/Dockerfile
+1 -1
View File
@@ -40,7 +40,7 @@ RUN rm /soft/*.sh -v
# last cmake from sources, into /opt # last cmake from sources, into /opt
WORKDIR /soft 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 \ && mkdir -p /opt/cmake \
&& bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/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 && rm -rf /soft/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh
windows-base/Dockerfile
+1 -1
View File
@@ -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/* && rm -rf /var/cache/apt/archives/*
WORKDIR /soft 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 \ && rm -rf /opt/cmake \
&& mkdir -p /opt/cmake \ && mkdir -p /opt/cmake \
&& bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/opt/cmake \ && bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/opt/cmake \
windows-clang/Dockerfile
+1 -1
View File
@@ -54,7 +54,7 @@ RUN unzip -o opencl_win.zip -d /soft/windows \
# last cmake from sources, into /opt # last cmake from sources, into /opt
ENV CUR_CMAKE_VERSION=3.31.3 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 \ && mkdir -p /opt/cmake \
&& bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/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 && rm -rf /soft/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh