diff --git a/Jenkinsfile b/Jenkinsfile index c78b1fa..df09ae2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,11 @@ node { def _msg = "Built images:" pl.forEach ({ dist -> - _msg += build_docker(dist, rel_dir) - }, stageSuffix: "-shstk") + _msg += build_docker(dist, rel_dir) + }, + stageSuffix: "-shstk", + ondemand: true + ) stage("Clean") { sh "docker system prune -f" diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile new file mode 100644 index 0000000..b214846 --- /dev/null +++ b/docker/astra1.7-shstk/Dockerfile @@ -0,0 +1,20 @@ +ARG DOCKER_PREFIX=wapmobil/ +ARG IMAGE_FROM +FROM ${DOCKER_PREFIX}${IMAGE_FROM} + +ARG LIBS_BUILD_NUMBER=9999 +ARG JOBS_COUNT=4 +ARG support_gl=1 +ENV PATH=/opt/cmake/bin:$PATH + +WORKDIR /soft +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git + +WORKDIR /soft/shstk_build_linux +RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ + && cmake --build ./ --target install -j${JOBS_COUNT} \ + && ldconfig \ + && cmake --build ./ --target deploy -j${JOBS_COUNT} \ + && rm -rf * + +WORKDIR /soft/src diff --git a/pip b/pip index 7eae1e1..af4b718 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 7eae1e127cdf88a8ea37f18eec7f26eddec56d5b +Subproject commit af4b71805365fee8097ad32f930a984ededd473a