diff options
Diffstat (limited to 'packaging/docker')
| -rw-r--r-- | packaging/docker/catlfish-dev/Dockerfile | 8 | ||||
| -rw-r--r-- | packaging/docker/catlfish-merge/Dockerfile | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/packaging/docker/catlfish-dev/Dockerfile b/packaging/docker/catlfish-dev/Dockerfile index 6eff721..2792a03 100644 --- a/packaging/docker/catlfish-dev/Dockerfile +++ b/packaging/docker/catlfish-dev/Dockerfile @@ -52,12 +52,14 @@ RUN useradd --uid 147 --gid 147 catlfish # Working has to be where catlfish.config is. We want to run in # /var/run/catlfish and not in /usr/local/etc/catlfish, so symlink. -RUN mkdir -p /var/run/catlfish/erlang_log /var/run/catlfish/sasl_log -RUN chown -R catlfish /var/run/catlfish -RUN ln -s /usr/local/etc/catlfish/catlfish.config /var/run/catlfish/ +RUN mkdir /var/run/catlfish WORKDIR /var/run/catlfish +RUN mkdir erlang_log sasl_log supervisord_log +RUN chown -R catlfish:catlfish /var/run/catlfish +RUN ln -s /usr/local/etc/catlfish/catlfish.config /var/run/catlfish/ # Run supervisord. ADD supervisord.conf /etc/supervisor/ +WORKDIR /var/run/catlfish USER catlfish CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"] diff --git a/packaging/docker/catlfish-merge/Dockerfile b/packaging/docker/catlfish-merge/Dockerfile index a3b55f4..cf6fa7a 100644 --- a/packaging/docker/catlfish-merge/Dockerfile +++ b/packaging/docker/catlfish-merge/Dockerfile @@ -31,9 +31,8 @@ RUN groupadd --gid 147 catlfish RUN useradd --uid 147 --gid 147 catlfish # We run from /var/run/catlfish. -RUN mkdir /var/run/catlfish -RUN chown catlfish /var/run/catlfish -RUN chmod 700 /var/run/catlfish +RUN mkdir -p /var/run/catlfish/supervisord_log +RUN chown -R catlfish:catlfish /var/run/catlfish WORKDIR /var/run/catlfish # Run supervisord. |