commit cc57c64c9a5b1c0e7935949560c13e45dc6da211
parent 0a295ce00f0f66b35adaca45ab5e9696a4337659
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Sun, 13 Nov 2016 23:22:04 +0100
splitting base container
Diffstat:
4 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
@@ -1,26 +0,0 @@
-FROM debian:stable
-
-RUN apt-get update && apt-get install -qqy \
- git \
- build-essential \
- autoconf \
- autopoint \
- libtool \
- libgcrypt20 \
- libidn11-dev \
- zlib1g-dev \
- libunistring-dev \
- libjansson-dev \
- libpq-dev \
- libmicrohttpd-dev
-
-RUN git clone https://gnunet.org/git/gnunet/ \
- && git clone https://gnunet.org/git/libmicrohttpd/ \
- && git clone git://taler.net/gnurl/
-
-WORKDIR gnurl
-
-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
diff --git a/docker/base/README b/docker/base/README
@@ -1,5 +1,11 @@
-This image serves as a basis to build exchange and merchant
-backend. It is responsible for installing the following packages:
+These images serve as a basis to build exchange and merchant
+backend. They are responsible for installing the following packages:
+The debian/ directory contains an image for getting packages only
+from debian repositories, whereas gnunet/ hosts one to get packages
+only from gnunet realm. This division's main aim is to speed up
+testing of building gnunet's packages, as we can cache the container
+of debian essential packages. Once it works, it can be merged in a
+single container.
- GNUnet
- Libjansson
diff --git a/docker/base/debian/Dockerfile b/docker/base/debian/Dockerfile
@@ -0,0 +1,15 @@
+FROM debian:stable
+
+RUN apt-get update && apt-get install -qqy \
+ git \
+ build-essential \
+ autoconf \
+ autopoint \
+ libtool \
+ libgcrypt20 \
+ libidn11-dev \
+ zlib1g-dev \
+ libunistring-dev \
+ libjansson-dev \
+ libpq-dev \
+ libmicrohttpd-dev
diff --git a/docker/base/gnunet/Dockerfile b/docker/base/gnunet/Dockerfile
@@ -0,0 +1,12 @@
+FROM taler/base/debian
+
+RUN git clone https://gnunet.org/git/gnunet/ \
+ && git clone https://gnunet.org/git/libmicrohttpd/ \
+ && git clone git://taler.net/gnurl/
+
+WORKDIR gnurl
+
+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
