diff options
| author | Linus Nordberg <linus@nordberg.se> | 2015-04-02 12:00:32 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2015-04-02 12:00:32 +0200 |
| commit | 8227a8350b80e1000c7f48f249072144f76ff907 (patch) | |
| tree | 3481d3375c549681b3c10f98da9eb2631fedfbe7 /packaging | |
| parent | 77331352bc3192e7edb72f347353d3538b75f114 (diff) | |
dockeridock
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/docker/catlfish-dev/Dockerfile | 4 | ||||
| -rw-r--r-- | packaging/docker/catlfish-merge/Dockerfile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packaging/docker/catlfish-dev/Dockerfile b/packaging/docker/catlfish-dev/Dockerfile index 6c5c72e..6eff721 100644 --- a/packaging/docker/catlfish-dev/Dockerfile +++ b/packaging/docker/catlfish-dev/Dockerfile @@ -46,10 +46,9 @@ RUN make -C catlfish PREFIX=/usr/local all release VOLUME /usr/local/etc/catlfish VOLUME /var/local/db/catlfish -# Don't run as root. +# Create a catlfish user. RUN groupadd --gid 147 catlfish RUN useradd --uid 147 --gid 147 catlfish -USER 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. @@ -60,4 +59,5 @@ WORKDIR /var/run/catlfish # Run supervisord. ADD supervisord.conf /etc/supervisor/ +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 a56ae39..a3b55f4 100644 --- a/packaging/docker/catlfish-merge/Dockerfile +++ b/packaging/docker/catlfish-merge/Dockerfile @@ -26,10 +26,9 @@ 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. +# Create a catlfish user. RUN groupadd --gid 147 catlfish RUN useradd --uid 147 --gid 147 catlfish -USER catlfish # We run from /var/run/catlfish. RUN mkdir /var/run/catlfish @@ -39,4 +38,5 @@ WORKDIR /var/run/catlfish # Run supervisord. ADD supervisord.conf /etc/supervisor/ +USER catlfish CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"] |