Skip to content

Commit

Permalink
[build] adapt jenkins CI files
Browse files Browse the repository at this point in the history
  • Loading branch information
the-hampel committed Aug 21, 2023
1 parent ccae541 commit 9195bf3
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 3 deletions.
16 changes: 16 additions & 0 deletions Docker/jenkins_ci_dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# See ../triqs/packaging for other options
FROM flatironinstitute/cthyb:master-ubuntu-clang
ARG APPNAME=solid_dmft

COPY requirements.txt /src/$APPNAME/requirements.txt
RUN pip3 install -r /src/$APPNAME/requirements.txt

COPY --chown=build . $SRC/$APPNAME
WORKDIR $BUILD/$APPNAME
RUN chown build .
USER build
ARG BUILD_ID
ARG CMAKE_ARGS
RUN cmake $SRC/$APPNAME -DTRIQS_ROOT=${INSTALL} $CMAKE_ARGS && make -j4 || make -j1 VERBOSE=1
USER root
RUN make install
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
checkout scm
/* construct a Dockerfile for this base */
sh """
( echo "FROM flatironinstitute/triqs:${triqsBranch}-${env.STAGE_NAME}" ; sed '0,/^FROM /d' Dockerfile ) > Dockerfile.jenkins
( echo "FROM flatironinstitute/triqs:${triqsBranch}-${env.STAGE_NAME}" ; sed '0,/^FROM /d' Docker/jenkins_ci_dockerfile ) > Dockerfile.jenkins
mv -f Dockerfile.jenkins Dockerfile
"""
/* build and tag */
Expand Down
8 changes: 6 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# Required python packages for this application (these should also be added to Dockerfile for Jenkins)
numpy scipy argparse pytest scikit-image
# Required python packages for this application
numpy
scipy
argparse
pytest
scikit-image

0 comments on commit 9195bf3

Please sign in to comment.