summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-04-02 11:48:15 +0200
committerLinus Nordberg <linus@nordberg.se>2015-04-02 11:48:15 +0200
commit77331352bc3192e7edb72f347353d3538b75f114 (patch)
treef6b8bb511c6e86c7bdc52b124d2425c2246b2475
parentf895fc7472adc8270585a45f800df47d0e2d2ab3 (diff)
create a group too
-rw-r--r--packaging/docker/catlfish-dev/Dockerfile6
-rw-r--r--packaging/docker/catlfish-merge/Dockerfile3
2 files changed, 4 insertions, 5 deletions
diff --git a/packaging/docker/catlfish-dev/Dockerfile b/packaging/docker/catlfish-dev/Dockerfile
index 5d0004a..6c5c72e 100644
--- a/packaging/docker/catlfish-dev/Dockerfile
+++ b/packaging/docker/catlfish-dev/Dockerfile
@@ -46,11 +46,9 @@ RUN make -C catlfish PREFIX=/usr/local all release
VOLUME /usr/local/etc/catlfish
VOLUME /var/local/db/catlfish
-RUN chgrp daemon /var/local/db/catlfish
-RUN chmod 775 /var/local/db/catlfish
-
# Don't run as root.
-RUN useradd --uid 147 catlfish
+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
diff --git a/packaging/docker/catlfish-merge/Dockerfile b/packaging/docker/catlfish-merge/Dockerfile
index bd67c9e..a56ae39 100644
--- a/packaging/docker/catlfish-merge/Dockerfile
+++ b/packaging/docker/catlfish-merge/Dockerfile
@@ -27,7 +27,8 @@ RUN mkdir -p /usr/local/catlfish/bin
ADD merge.sh /usr/local/catlfish/bin/
# Don't run as root.
-RUN useradd --uid 147 catlfish
+RUN groupadd --gid 147 catlfish
+RUN useradd --uid 147 --gid 147 catlfish
USER catlfish
# We run from /var/run/catlfish.