diff options
| author | Linus Nordberg <linus@nordberg.se> | 2015-03-31 18:27:47 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2015-04-01 12:59:16 +0200 |
| commit | 9fffe3b26263d8449d7543de336bb1168f4a8f62 (patch) | |
| tree | 6d68291adf45e0e3eefadf9b5fc648e44292aba0 | |
| parent | 1dbc1dbf9019f138bd1fa23219d7d33e113cb393 (diff) | |
Full path to "exec".
| -rw-r--r-- | packaging/docker/catlfish-dev/Dockerfile | 10 | ||||
| -rw-r--r-- | packaging/docker/catlfish-dev/supervisord.conf | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/packaging/docker/catlfish-dev/Dockerfile b/packaging/docker/catlfish-dev/Dockerfile index ae50409..b3d19cb 100644 --- a/packaging/docker/catlfish-dev/Dockerfile +++ b/packaging/docker/catlfish-dev/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selections RUN apt-get -y -q install gcc git make curl +# Build dependencies in /usr/local/src. WORKDIR /usr/local/src RUN curl https://www.ct.nordu.net/dist/mochiweb-v2.12.2.tar.gz | tar xzf - @@ -29,6 +30,7 @@ RUN curl https://www.ct.nordu.net/dist/erlang-idna-1.0.2.tar.gz | tar xzf - -C h RUN curl https://www.ct.nordu.net/dist/ssl_verify_hostname-1.0.4.tar.gz | tar xzf - -C hackney/deps && ln -s ssl_verify_hostname-1.0.4 hackney/deps/ssl_verify_hostname RUN make -C hackney REBAR=../lager/rebar +# Build plop and catlfish. RUN git clone https://git.nordu.net/plop.git RUN make -C plop @@ -36,9 +38,15 @@ RUN git clone https://git.nordu.net/catlfish.git RUN make -C catlfish all RUN make -C catlfish PREFIX=/usr/local/catlfish release +# Config dir and database dir are mounted from host using `-v' to +# 'docker run'. VOLUME /usr/local/catlfish VOLUME /var/local/db/catlfish -ADD supervisord.conf /etc/supervisor/ +# Working directory is where catlfish.config is. WORKDIR /usr/local/etc/catlfish + +# Run supervisord. TODO: make log- and pidfile end up in +# /var/run/catlfish +ADD supervisord.conf /etc/supervisor/ CMD ["/usr/bin/supervisord"] diff --git a/packaging/docker/catlfish-dev/supervisord.conf b/packaging/docker/catlfish-dev/supervisord.conf index 5fb2e52..67c7b1d 100644 --- a/packaging/docker/catlfish-dev/supervisord.conf +++ b/packaging/docker/catlfish-dev/supervisord.conf @@ -2,4 +2,4 @@ nodaemon=true [program:catlfish] -command=/usr/local/catlfish/bin/run_erl -daemon /var/run/ /var/log/catlfish/ "exec bin/erl -config catlfish" +command=/usr/local/catlfish/bin/run_erl -daemon /var/run/ /var/log/catlfish/ "exec /usr/local/catlfish/bin/erl -config catlfish" |