diff options
Diffstat (limited to 'packaging/docker/catlfish-merge/Dockerfile')
| -rw-r--r-- | packaging/docker/catlfish-merge/Dockerfile | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/packaging/docker/catlfish-merge/Dockerfile b/packaging/docker/catlfish-merge/Dockerfile index 23d2003..bd67c9e 100644 --- a/packaging/docker/catlfish-merge/Dockerfile +++ b/packaging/docker/catlfish-merge/Dockerfile @@ -1,7 +1,11 @@ # Docker file for catlfish merge. # +# NOTE: The directory on the host system that's mounted at +# /var/local/db/catlfish-merge in the container has to be writable by +# a host user with uid 147. +# # $ docker run \ -# -v /etc/catlfish:/usr/local/etc/catlfish \ +# -v /etc/catlfish:/usr/local/etc/catlfish:ro \ # -v /var/local/db/catlfish-merge:/var/local/db/catlfish-merge \ # catlfish-merge @@ -22,19 +26,16 @@ VOLUME /var/local/db/catlfish-merge RUN mkdir -p /usr/local/catlfish/bin ADD merge.sh /usr/local/catlfish/bin/ +# Don't run as root. +RUN useradd --uid 147 catlfish +USER catlfish + # We run from /var/run/catlfish. RUN mkdir /var/run/catlfish -RUN chgrp daemon /var/run/catlfish -RUN chmod 775 /var/run/catlfish +RUN chown catlfish /var/run/catlfish +RUN chmod 700 /var/run/catlfish WORKDIR /var/run/catlfish -# -RUN chgrp daemon /var/local/db/catlfish-merge -RUN chmod 775 /var/local/db/catlfish-merge - -# Don't run as root. -USER daemon - # Run supervisord. ADD supervisord.conf /etc/supervisor/ CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"] |