[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: - fixing Dockerfile
From: |
gnunet |
Subject: |
[gnunet] branch master updated: - fixing Dockerfile |
Date: |
Thu, 03 Nov 2022 17:10:48 +0100 |
This is an automated email from the git hooks/post-receive script.
trizuz pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 35a4a8be1 - fixing Dockerfile
35a4a8be1 is described below
commit 35a4a8be19615516ebf1b45837867cda1a90303f
Author: Tristan Schwieren <tristan.schwieren@tum.de>
AuthorDate: Thu Nov 3 17:10:40 2022 +0100
- fixing Dockerfile
---
bootstrap | 10 ++++-
contrib/docker/Dockerfile | 105 ++++++++++++++++++++++------------------------
contrib/docker/README.md | 5 ++-
3 files changed, 61 insertions(+), 59 deletions(-)
diff --git a/bootstrap b/bootstrap
index c1ef83e01..28afd657f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -165,10 +165,16 @@ main()
cleanup
submodules
gana_update
- sphinx_update
- check_uncrustify
check_yapf
check_libtool
+ check_uncrustify
+
+ if [ "$#" = "1" ] && [ "$1" = "--no-doc" ]
+ then
+ echo "Do not create documentation"
+ else
+ sphinx_update
+ fi
}
main "$@"
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index adcd7132c..55f86149a 100644
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -1,16 +1,27 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
ENV DEBIAN_FRONTEND noninteractive
# Install tools and dependencies
-RUN apt-get update && \
- apt-get -y install --no-install-recommends \
+RUN apt-get update
+RUN apt-get upgrade
+RUN apt-get -y install --no-install-recommends \
ca-certificates \
libsasl2-modules \
git \
automake \
autopoint \
autoconf \
+ recutils \
+ make \
+ libssl-dev \
+ ninja-build \
+ meson \
+ curl \
+ libcurl4-gnutls-dev \
+ libsodium-dev \
+ libsodium23 \
+ libjansson-dev \
texinfo \
libtool \
libltdl-dev \
@@ -25,70 +36,54 @@ RUN apt-get update && \
libgcrypt20-dev \
libpq-dev \
libsqlite3-dev \
- wget && \
- apt-get clean all && \
+ wget
+RUN apt-get clean all && \
apt-get -y autoremove && \
rm -rf \
/var/lib/apt/lists/* \
/tmp/*
-# Install GNUrl
-ENV GNURL_VERSION=7.57.0
-
-RUN wget -O /tmp/gnurl.tar.xz
https://ftpmirror.gnu.org/gnu/gnunet/gnurl-${GNURL_VERSION}.tar.xz
+# Install jose
+RUN wget -O /tmp/jose.tar.gz
https://github.com/latchset/jose/archive/refs/tags/v11.tar.gz
RUN cd /tmp && \
- tar xvf gnurl.tar.xz && \
- cd gnurl-${GNURL_VERSION} && \
- autoreconf -i && \
- ./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 && \
- make install && \
- cd - && \
- rm -rf /tmp/gnurl*
+ tar xvf jose.tar.gz && \
+ cd jose-11 && \
+ mkdir build && \
+ cd build && \
+ meson .. --prefix=/usr && \
+ ninja && \
+ ninja install && \
+ cd / && \
+ rm -rf /tmp/jose-11/*
# Install GNUnet
-ENV GNUNET_PREFIX /usr/local/gnunet
+ENV GNUNET_PREFIX=/usr/local/lib
ENV CFLAGS '-g -Wall -O0'
COPY . /gnunet
+WORKDIR /gnunet
+RUN ./bootstrap --no-doc
+RUN ./configure \
+ --with-nssdir=/lib \
+ --prefix="$GNUNET_PREFIX/.." \
+ --enable-logging=verbose
+RUN make -j
+RUN make install
+RUN ldconfig
+WORKDIR /
+RUN rm -rf /gnunet
-RUN cd /gnunet && \
- ./bootstrap && \
- ./configure \
- --with-nssdir=/lib \
- --prefix="$GNUNET_PREFIX" \
- --enable-logging=verbose && \
- make -j3 && \
- make install && \
- ldconfig && \
- cd - && \
- rm -fr /gnunet
+# RUN cd /gnunet && \
+# ./bootstrap && \
+# ./configure \
+# --with-nssdir=/lib \
+# --prefix="$GNUNET_PREFIX" \
+# --enable-logging=verbose && \
+# make -j && \
+# make install && \
+# ldconfig && \
+# cd - && \
+# rm -fr /gnunet
# Configure GNUnet
COPY ./contrib/docker/gnunet.conf /etc/gnunet.conf
diff --git a/contrib/docker/README.md b/contrib/docker/README.md
index ce05012fc..66ba45d26 100644
--- a/contrib/docker/README.md
+++ b/contrib/docker/README.md
@@ -10,13 +10,14 @@ This will take quite a while and will consume a bit of data.
First you need to go to the root of this repo.
```bash
-cd ..
+cd ../..
```
Now you can build the image.
```bash
-docker build -t gnunet .
+make clean
+docker build -f contrib/docker/Dockerfile -t gnunet .
```
## Start it from the newly created gnunet image
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: - fixing Dockerfile,
gnunet <=