diff --git a/Dockerfile b/Dockerfile index ba56f552549165637989c07b1fd254ba1db3e400..8c1970f93aa6e299a82472347f5166b2472a5436 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/savoirfairelinux/opendht/opendht-alpine:latest +FROM ghcr.io/savoirfairelinux/opendht/opendht-alpine:latest as build RUN apk add --no-cache \ build-base cmake ninja git wget \ @@ -19,9 +19,9 @@ RUN mkdir restinio && cd restinio \ && cd ../../.. && rm -rf restinio # Build pjproject -RUN wget https://github.com/savoirfairelinux/pjproject/archive/e4b83585a0bdf1523e808a4fc1946ec82ac733d0.tar.gz \ - && tar -xzf e4b83585a0bdf1523e808a4fc1946ec82ac733d0.tar.gz \ - && mv pjproject-e4b83585a0bdf1523e808a4fc1946ec82ac733d0 pjproject \ +RUN wget https://github.com/savoirfairelinux/pjproject/archive/97f45c2040c2b0cf6f3349a365b0e900a2267333.tar.gz \ + && tar -xzf 97f45c2040c2b0cf6f3349a365b0e900a2267333.tar.gz \ + && mv pjproject-97f45c2040c2b0cf6f3349a365b0e900a2267333 pjproject \ && cd pjproject \ && EXCLUDE_APP=1 ./aconfigure --prefix=/usr --disable-sound \ --enable-video \ @@ -50,7 +50,6 @@ COPY . dhtnet RUN mkdir /install ENV DESTDIR /install -#RUN cd dhtnet && mkdir build_dev && cd build_dev \ -# && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -# -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \ -# && make -j8 && make install +RUN cd dhtnet && mkdir build_dev && cd build_dev \ + && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ + && make -j2 && make install diff --git a/Jenkinsfile b/Jenkinsfile index aac02ad77e2a673ed77fd47436002751a7d8f0c8..6a41bc1d7bd7761aba1e241e46838c3db8b08e66 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,10 @@ pipeline { stages { stage('Build') { steps { - sh 'mkdir build && cd build && cmake .. && make' + script { + docker.build("dhtnet:${env.BUILD_ID}", "--target build .") + sh "docker run -t --rm dhtnet:${env.BUILD_ID}" + } } } }