summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-11-13 23:45:42 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-11-13 23:45:42 +0100
commit68f2f011aa99b077931b54b7ee91221460269751 (patch)
treee4d3912412ebe87c03fea9908c9702135f7ade93
parent798efacca1f22bbc0b055eb7bb7a1ccad530dc1c (diff)
downloaddeployment-68f2f011aa99b077931b54b7ee91221460269751.tar.gz
deployment-68f2f011aa99b077931b54b7ee91221460269751.tar.bz2
deployment-68f2f011aa99b077931b54b7ee91221460269751.zip
building gnunet in container
-rw-r--r--docker/base/Dockerfile7
-rwxr-xr-xtaler-build/update_gnunet.sh2
2 files changed, 8 insertions, 1 deletions
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index e488146..9235d5c 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -24,3 +24,10 @@ RUN ./buildconf \
&& ./configure --enable-ipv6 --with-gnutls --without-libssh2 --without-libmetalink --without-winidn --without-librtmp --without-nghttp2 --without-nss --without-cyassl --without-polarssl --without-ssl --without-winssl --without-darwinssl --disable-sspi --disable-ntlm-wb --disable-ldap --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-file --disable-ftp --disable-smb --prefix=$HOME/local \
&& make \
&& make install
+
+WORKDIR gnunet
+
+RUN ./bootstrap \
+ && ./configure --with-libgnurl=/usr/local/ \
+ && make \
+ && make install
diff --git a/taler-build/update_gnunet.sh b/taler-build/update_gnunet.sh
index c2201ba..c1a013e 100755
--- a/taler-build/update_gnunet.sh
+++ b/taler-build/update_gnunet.sh
@@ -6,6 +6,6 @@ cd $HOME/gnunet/
svn revert -R .
svn update
./bootstrap
-./configure --prefix=$HOME/local --enable-logging=verbose --with-libgnurl=$HOME/local --with-microhttps=$HOME/local
+./configure --prefix=$HOME/local --enable-logging=verbose --with-libgnurl=$HOME/local --with-microhttpd=$HOME/local
make
make install