LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-12-21 11:53:41 +01:00
Code Issues Releases Wiki Activity

[doc] Updating jenkins and dockerfile after previous commit

Browse Source
This commit is contained in:
Nils Wentzell 2018-03-13 13:29:43 +01:00
parent a89d558cd6
commit dae191720c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -5,7 +5,7 @@ COPY . ${SRC}/dft_tools
WORKDIR ${BUILD}/dft_tools WORKDIR ${BUILD}/dft_tools
RUN chown build . RUN chown build .
USER build USER build
ARG BUILD_DOC=0 ARG Build_Documentation=0
RUN cmake ${SRC}/dft_tools -DTRIQS_ROOT=${INSTALL} -DBUILD_DOC=${BUILD_DOC} && make -j2 && make test RUN cmake ${SRC}/dft_tools -DTRIQS_ROOT=${INSTALL} -DBuild_Documentation=${Build_Documentation} && make -j2 && make test
USER root USER root
RUN make install RUN make install

2
Jenkinsfile vendored
View File

@ -28,7 +28,7 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
mv -f Dockerfile.jenkins Dockerfile mv -f Dockerfile.jenkins Dockerfile
""" """
/* build and tag */ /* build and tag */
def img = docker.build("flatironinstitute/${projectName}:${env.BRANCH_NAME}-${env.STAGE_NAME}", "--build-arg BUILD_DOC=${platform==documentationPlatform} .") def img = docker.build("flatironinstitute/${projectName}:${env.BRANCH_NAME}-${env.STAGE_NAME}", "--build-arg Build_Documentation=${platform==documentationPlatform} .")
if (env.BRANCH_NAME.startsWith("PR-") || platform != documentationPlatform) { if (env.BRANCH_NAME.startsWith("PR-") || platform != documentationPlatform) {
/* but we don't need the tag so clean it up (except for documentation) */ /* but we don't need the tag so clean it up (except for documentation) */
sh "docker rmi ${img.imageName()}" sh "docker rmi ${img.imageName()}"