SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

retry

Browse Source
This commit is contained in:
Пелипенко Иван
2020-05-18 19:34:12 +03:00
parent 72e7b42813
commit 4bc671584c
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

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

4
docker/debian-libs/Dockerfile
View File

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