summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
Diffstat (limited to 'packaging')
-rw-r--r--packaging/docker/README8
-rw-r--r--packaging/docker/base-debian:jessie/Dockerfile3
-rwxr-xr-x[-rw-r--r--]packaging/docker/build.sh0
-rw-r--r--packaging/docker/catlfish-dev/Dockerfile9
-rw-r--r--packaging/docker/erlang/Dockerfile3
5 files changed, 14 insertions, 9 deletions
diff --git a/packaging/docker/README b/packaging/docker/README
index 24e7e1b..0a75c10 100644
--- a/packaging/docker/README
+++ b/packaging/docker/README
@@ -1,14 +1,16 @@
Requirements:
- lack of expectations regarding security -- docker doesn't verify
downloaded images
-- a 64-bit debian or ubuntu system
+- a 64-bit Linux system
- lxc-docker version 1.3 or later
-Build a docker image with catlfish:
+Build a docker image with catlfish. Note that you will have to cd into
+this directory, catlfish/packaging/docker, in order for docker to find
+the appropriate docker files.
$ ./build.sh
-The resulting image can be run in interactive mode by:
+Run the resulting image in interactive mode.
$ docker run -it --rm catlfish /bin/bash
diff --git a/packaging/docker/base-debian:jessie/Dockerfile b/packaging/docker/base-debian:jessie/Dockerfile
index 1c248c0..6a30a45 100644
--- a/packaging/docker/base-debian:jessie/Dockerfile
+++ b/packaging/docker/base-debian:jessie/Dockerfile
@@ -1,4 +1,5 @@
FROM debian:jessie
RUN apt-get update
-RUN apt-get install -qq supervisor
+RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selections
+RUN apt-get install -y -q supervisor
RUN mkdir -p /var/log/supervisor
diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh
index 2b47222..2b47222 100644..100755
--- a/packaging/docker/build.sh
+++ b/packaging/docker/build.sh
diff --git a/packaging/docker/catlfish-dev/Dockerfile b/packaging/docker/catlfish-dev/Dockerfile
index 0326aea..cbfc285 100644
--- a/packaging/docker/catlfish-dev/Dockerfile
+++ b/packaging/docker/catlfish-dev/Dockerfile
@@ -1,19 +1,20 @@
FROM erlang
RUN apt-get update
-RUN apt-get install -qq \
+RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selections
+RUN apt-get install -y -q \
gcc \
git \
make
WORKDIR /opt
-RUN git clone -b v2.9.2 https://github.com/mochi/mochiweb
+RUN git clone -b v2.12.2 https://github.com/mochi/mochiweb
RUN make -C mochiweb
-RUN git clone -b 2.1.0 https://github.com/basho/lager
+RUN git clone -b 2.1.1 https://github.com/basho/lager
RUN make -C lager
-RUN git clone -b 1.0.6-ndn-3 https://github.com/NORDUnet/hackney.git
+RUN git clone -b 1.1.0 https://github.com/benoitc/hackney.git
RUN make -C hackney REBAR=../lager/rebar
RUN git clone https://git.nordu.net/plop.git
diff --git a/packaging/docker/erlang/Dockerfile b/packaging/docker/erlang/Dockerfile
index 2212df6..c33a22b 100644
--- a/packaging/docker/erlang/Dockerfile
+++ b/packaging/docker/erlang/Dockerfile
@@ -1,6 +1,7 @@
FROM base
RUN apt-get update
-RUN apt-get install -qq \
+RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selections
+RUN apt-get install -y -q \
erlang-base \
erlang-crypto \
erlang-dev \