Merge pull request 'docker' (#21) from master into release
Some checks failed
SHS Gitea/libs/pipeline/head There was a failure building this commit

This commit was merged in pull request #21.
This commit is contained in:
2020-05-18 19:18:47 +03:00
3 changed files with 4 additions and 3 deletions

1
Jenkinsfile vendored
View File

@@ -10,6 +10,7 @@ def build_docker(name) {
jobs = "${env.JOBS_COUNT}"
}
def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}"
args += " -v `pwd`:/soft/libs -v `pwd`/../libs_build_${name}:/soft/libs_build_${name} --build-arg HAS_SOURCES=1"
dir ("docker/${image}") {
//echo "build ${image} ${args}"
sh "docker build ${args} --no-cache -t ${image} ."

View File

@@ -3,14 +3,14 @@ FROM ${DOCKER_PREFIX}debian
ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4
ARG HAS_SOURCES=0
WORKDIR /soft
RUN git clone -b release --depth 1 --recursive https://git.shs.tools/SHS/libs.git
RUN if [ $HAS_SOURCES -eq 0 ]; then git clone -b release --depth 1 --recursive https://git.shs.tools/SHS/libs.git; fi
WORKDIR /soft/libs_build_debian
RUN cmake -DICU=0 -DLIB=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs \
&& make install -j${JOBS_COUNT} \
&& rm -rf * \
&& ldconfig
WORKDIR /soft/src

2
pip

Submodule pip updated: d2cb72c676...b860d8bbaf