From 09129e53a64eee0deb7d3a9d422c775778ae64db Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Sun, 13 Nov 2016 23:33:37 +0100
Subject: reverting split

---
 docker/base/README            | 10 ++--------
 docker/base/debian/Dockerfile | 15 ---------------
 docker/base/gnunet/Dockerfile | 12 ------------
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 docker/base/debian/Dockerfile
 delete mode 100644 docker/base/gnunet/Dockerfile

diff --git a/docker/base/README b/docker/base/README
index 8612a0c..573f4ef 100644
--- a/docker/base/README
+++ b/docker/base/README
@@ -1,11 +1,5 @@
-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.
+This image serves as a basis to build exchange and merchant
+backend. It is responsible for installing the following packages:
 
 - GNUnet
 - Libjansson
diff --git a/docker/base/debian/Dockerfile b/docker/base/debian/Dockerfile
deleted file mode 100644
index 6b2b1a1..0000000
--- a/docker/base/debian/Dockerfile
+++ /dev/null
@@ -1,15 +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
diff --git a/docker/base/gnunet/Dockerfile b/docker/base/gnunet/Dockerfile
deleted file mode 100644
index 02a2a46..0000000
--- a/docker/base/gnunet/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-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
-- 
cgit v1.2.3