From 8227a8350b80e1000c7f48f249072144f76ff907 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Thu, 2 Apr 2015 12:00:32 +0200
Subject: dockeridock

---
 packaging/docker/catlfish-merge/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packaging/docker/catlfish-merge')

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"]
-- 
cgit v1.1