Merge pull request 'retry' (#23) from master into release
All checks were successful
SHS Gitea/libs/pipeline/head This commit looks good
All checks were successful
SHS Gitea/libs/pipeline/head This commit looks good
This commit was merged in pull request #23.
This commit is contained in:
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@@ -9,9 +9,7 @@ def build_docker(name) {
|
||||
if (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}"
|
||||
args += " --build-arg HAS_SOURCES=1 -v ${_pwd}:/soft/libs -v ${_pwd}/../libs_build_${name}:/soft/libs_build_${name}"
|
||||
dir ("docker/${image}") {
|
||||
//echo "build ${image} ${args}"
|
||||
sh "docker build ${args} --no-cache -t ${image} ."
|
||||
|
||||
@@ -3,14 +3,14 @@ FROM ${DOCKER_PREFIX}debian
|
||||
|
||||
ARG LIBS_BUILD_NUMBER=9999
|
||||
ARG JOBS_COUNT=4
|
||||
ARG HAS_SOURCES=0
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user