From eb879d7b501a840c2801ca91e3f06ef6b81d2277 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Fri, 27 Feb 2015 14:17:19 +0100 Subject: Make build.sh executable. --- packaging/docker/build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 packaging/docker/build.sh (limited to 'packaging/docker') diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh old mode 100644 new mode 100755 -- cgit v1.1 From b3e0e91b7e7e50e5f907e1872751a1a82a2f6351 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 26 Mar 2015 13:20:42 +0100 Subject: [Docker] Use newer mochiweb, lager and hackney. --- packaging/docker/catlfish-dev/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packaging/docker') diff --git a/packaging/docker/catlfish-dev/Dockerfile b/packaging/docker/catlfish-dev/Dockerfile index 0326aea..8849734 100644 --- a/packaging/docker/catlfish-dev/Dockerfile +++ b/packaging/docker/catlfish-dev/Dockerfile @@ -7,13 +7,13 @@ RUN apt-get install -qq \ 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 -- cgit v1.1 From d0a85087278f46b60ea3ada2e9d39bb4e82fad85 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 26 Mar 2015 14:11:38 +0100 Subject: Don't apt-get -qq. Set frontend 'noninteractive' first. --- packaging/docker/base-debian:jessie/Dockerfile | 3 ++- packaging/docker/catlfish-dev/Dockerfile | 3 ++- packaging/docker/erlang/Dockerfile | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'packaging/docker') 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/catlfish-dev/Dockerfile b/packaging/docker/catlfish-dev/Dockerfile index 8849734..cbfc285 100644 --- a/packaging/docker/catlfish-dev/Dockerfile +++ b/packaging/docker/catlfish-dev/Dockerfile @@ -1,6 +1,7 @@ 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 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 \ -- cgit v1.1 From f38b28bfe90ac9c35c8b2edcf296720e189f7083 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 26 Mar 2015 14:45:38 +0100 Subject: Update docker docu a bit. --- packaging/docker/README | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'packaging/docker') 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 -- cgit v1.1