aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/docker/Dockerfile21
1 files changed, 10 insertions, 11 deletions
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index 4fdd91f60..d1678a4a6 100644
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -24,7 +24,8 @@ RUN apt-get update && \
24 libgnutls28-dev \ 24 libgnutls28-dev \
25 libgcrypt20-dev \ 25 libgcrypt20-dev \
26 libpq-dev \ 26 libpq-dev \
27 libsqlite3-dev && \ 27 libsqlite3-dev \
28 wget && \
28 apt-get clean all && \ 29 apt-get clean all && \
29 apt-get -y autoremove && \ 30 apt-get -y autoremove && \
30 rm -rf \ 31 rm -rf \
@@ -32,14 +33,12 @@ RUN apt-get update && \
32 /tmp/* 33 /tmp/*
33 34
34# Install GNUrl 35# Install GNUrl
35ENV GNURL_GIT_URL https://git.taler.net/gnurl.git 36ENV GNURL_VERSION=7.57.0
36ENV GNURL_GIT_BRANCH gnurl-7.57.0
37 37
38RUN git clone $GNURL_GIT_URL \ 38RUN wget -O /tmp/gnurl.tar.bz2 https://gnunet.org/sites/default/files/gnurl-${GNURL_VERSION}.tar.bz2
39 --branch $GNURL_GIT_BRANCH \ 39RUN cd /tmp && \
40 --depth=1 \ 40 tar xvf gnurl.tar.bz2 && \
41 --quiet && \ 41 cd gnurl-${GNURL_VERSION} && \
42 cd /gnurl && \
43 autoreconf -i && \ 42 autoreconf -i && \
44 ./configure \ 43 ./configure \
45 --enable-ipv6 \ 44 --enable-ipv6 \
@@ -71,7 +70,7 @@ RUN git clone $GNURL_GIT_URL \
71 --disable-smb && \ 70 --disable-smb && \
72 make install && \ 71 make install && \
73 cd - && \ 72 cd - && \
74 rm -fr /gnurl 73 rm -rf /tmp/gnurl*
75 74
76# Install GNUnet 75# Install GNUnet
77ENV GNUNET_PREFIX /usr/local/gnunet 76ENV GNUNET_PREFIX /usr/local/gnunet
@@ -92,8 +91,8 @@ RUN cd /gnunet && \
92 rm -fr /gnunet 91 rm -fr /gnunet
93 92
94# Configure GNUnet 93# Configure GNUnet
95COPY docker/gnunet.conf /etc/gnunet.conf 94COPY ./contrib/docker/gnunet.conf /etc/gnunet.conf
96COPY docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint 95COPY ./contrib/docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
97RUN chmod 755 /usr/local/bin/docker-entrypoint 96RUN chmod 755 /usr/local/bin/docker-entrypoint
98 97
99ENV LOCAL_PORT_RANGE='40001 40200' 98ENV LOCAL_PORT_RANGE='40001 40200'