Move user creation from base to discourse and dev

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index c3ccbbe9cacdbd73df27c601e8e21bd799f4ff90..7429610c9546cd2d99558c6f80e47cf8d6742709 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -120,8 +120,3 @@ ADD boot /sbin/boot
 ADD cron /etc/service/cron/run
 ADD rsyslog /etc/service/rsyslog/run
 ADD cron.d_anacron /etc/cron.d/anacron
-
-# Create discourse user and /var/www location for both
-# discourse and dev images.
-RUN useradd discourse -s /bin/bash -m -U &&\
-    mkdir -p /var/www

diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile
index c1137fd454107afd1af96d63038151d2f36e354b..d3e53015086ac43408ac8d70f9e8c6a553bd3e10 100644 (file)
--- a/image/discourse/Dockerfile
+++ b/image/discourse/Dockerfile
@@ -5,12 +5,14 @@ FROM discourse/base:1.3.7
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
 # Discourse specific bits
-RUN  cd /var/www &&\
-     git clone https://github.com/discourse/discourse.git &&\
-     cd discourse &&\
-      git remote set-branches --add origin tests-passed &&\
+RUN useradd discourse -s /bin/bash -m -U &&\
+    mkdir -p /var/www &&\
+    cd /var/www &&\
+    git clone https://github.com/discourse/discourse.git &&\
+    cd discourse &&\
+    git remote set-branches --add origin tests-passed &&\
     chown -R discourse:discourse /var/www/discourse &&\
     cd /var/www/discourse &&\
-     sudo -u discourse bundle install --deployment \
+    sudo -u discourse bundle install --deployment \
          --without test --without development &&\
     find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} +

diff --git a/image/discourse_dev/Dockerfile b/image/discourse_dev/Dockerfile
index fe1ecb702c8744e5c9b06033df61dc62cad47d09..5114606d8e0c7e34da5366db86140287c77fe7bb 100644 (file)
--- a/image/discourse_dev/Dockerfile
+++ b/image/discourse_dev/Dockerfile
@@ -4,6 +4,11 @@ FROM discourse/base:1.3.7
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
+# Create discourse user and /var/www location for both
+# discourse and dev images.
+RUN useradd discourse -s /bin/bash -m -U &&\
+    mkdir -p /var/www
+
 # Give discourse user no-passwd sudo permissions (for bundle install)
 ADD sudoers.discourse /etc/sudoers.d/discourse