summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-11-13 23:22:04 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-11-13 23:22:04 +0100
commitcc57c64c9a5b1c0e7935949560c13e45dc6da211 (patch)
treec2c0d245cc1f7eaf927d0455cbd74dce26bd88d6 /docker
parent0a295ce00f0f66b35adaca45ab5e9696a4337659 (diff)
downloaddeployment-cc57c64c9a5b1c0e7935949560c13e45dc6da211.tar.gz
deployment-cc57c64c9a5b1c0e7935949560c13e45dc6da211.tar.bz2
deployment-cc57c64c9a5b1c0e7935949560c13e45dc6da211.zip
splitting base container
Diffstat (limited to 'docker')
-rw-r--r--docker/base/README10
-rw-r--r--docker/base/debian/Dockerfile15
-rw-r--r--docker/base/gnunet/Dockerfile (renamed from docker/base/Dockerfile)16
3 files changed, 24 insertions, 17 deletions
diff --git a/docker/base/README b/docker/base/README
index 573f4ef..8612a0c 100644
--- 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
new file mode 100644
index 0000000..6b2b1a1
--- /dev/null
+++ 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/Dockerfile b/docker/base/gnunet/Dockerfile
index 026d3a6..02a2a46 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/gnunet/Dockerfile
@@ -1,18 +1,4 @@
-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
+FROM taler/base/debian
RUN git clone https://gnunet.org/git/gnunet/ \
&& git clone https://gnunet.org/git/libmicrohttpd/ \