diff --git a/Jenkinsfile b/Jenkinsfile index e4ffc2c..7048edf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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} ." diff --git a/docker/debian-libs/Dockerfile b/docker/debian-libs/Dockerfile index af6ae8a..bbeb141 100644 --- a/docker/debian-libs/Dockerfile +++ b/docker/debian-libs/Dockerfile @@ -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 diff --git a/pip b/pip index d2cb72c..b860d8b 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit d2cb72c67657b790a97f52ddefd51b6052a285a7 +Subproject commit b860d8bbafcde76290321b3e1b79b8ec400e0700