commit 90f8a5ade2b091b3973406f3188856c24da31dce
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Tue Sep 19 14:58:20 2023 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Tue Sep 19 15:03:42 2023 -0400
tree 2aa3f938068d67d30759b7cfce774a687966107d
parent 1299a0d34b15e3dbba2fc0637d04f79a2bc986b4

Jenkins: use Docker

Change-Id: Id7acbd8e217fc55668c8d1943f0464308fce62bc

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index ba56f55..8c1970f 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 @@
     && 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 @@
 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