Only extract variable data, use params

1 files changed, 32 insertions, 14 deletions

diff --git a/bugzilla/Dockerfile b/bugzilla/Dockerfile
index 69ef6f0..c97e197 100644
--- a/bugzilla/Dockerfile
+++ b/bugzilla/Dockerfile
@@ -1,5 +1,6 @@
 FROM ubuntu:16.04
 MAINTAINER Michael Crute <mike@crute.us>
+ARG bz_version
 
 ADD binaries/ /tmp/
 
@@ -17,10 +18,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 # Install system dependencies
     apt-get install -y \
-        python-boto3 \
         cron \
-        runit \
         nginx \
+        python-boto3 \
+        runit \
+        sudo \
         syslog-ng \
     && \
 
@@ -79,33 +81,49 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 # Setup users and groups
     groupadd -g 901 bugzilla && \
     usermod -a -G bugzilla www-data && \
-    useradd -d /var/www/html/bugzilla -M -N -g bugzilla -s /bin/bash -u 901 bugzilla && \
+    useradd -d /var/www/html/bugzilla -M -N -g bugzilla -G www-data -s /bin/bash -u 901 bugzilla && \
 
 # Setup bugzilla app
     mkdir -p /var/www/html && \
-    mkdir /srv/bugzilla && \
-    tar -C /var/www/html/ -xvzf /tmp/release-5.1.1.tar.gz && \
-    ln -s /var/www/html/bugzilla-release-5.1.1 /var/www/html/bugzilla && \
+    tar -C /var/www/html/ -xvzf /tmp/release-${bz_version}.tar.gz && \
+    ln -s /var/www/html/bugzilla-release-${bz_version} /var/www/html/bugzilla && \
     tar -C /var/www/html/bugzilla/skins/contrib/ -xvzf /tmp/Bright-Skin.tar.gz && \
     rm /etc/nginx/sites-enabled/default && \
     ln -s /etc/nginx/sites-available/bugzilla /etc/nginx/sites-enabled/bugzilla && \
-    chown -R bugzilla:www-data /srv/bugzilla && \
 
 # Run the initial setup
+#
+# The bugzilla user must have permissions to modify files in the release
+# directory because checksetup.pl will change permissions so that the files are
+# owned by that user. Without those permission changes running plack will fail
+# with permission errors. Additionally, all checksetup.pl invocations must
+# happen as the bugzilla user for permissions to be properly updated.
+
+    chown -R bugzilla /var/www/html/bugzilla-release-${bz_version} && \
+
     # First time creates the config file
-    cd /var/www/html/bugzilla && ./checksetup.pl /tmp/answers.pl && \
+    cd /var/www/html/bugzilla && sudo -u bugzilla ./checksetup.pl /tmp/answers.pl && \
 
     # Second time does the real setup
-    cd /var/www/html/bugzilla && ./checksetup.pl /tmp/answers.pl && \
-
-    # Fix filesystem permissions
-    chown -R bugzilla:www-data /var/www/html/bugzilla-release-5.1.1 && \
+    cd /var/www/html/bugzilla && sudo -u bugzilla ./checksetup.pl /tmp/answers.pl && \
 
 # Allow admin overrides
-    mv /var/www/html/bugzilla/data /srv/bugzilla/data && \
+    mkdir /srv/bugzilla && \
+
     mv /var/www/html/bugzilla/localconfig /srv/bugzilla/localconfig && \
     ln -s /srv/bugzilla/localconfig /var/www/html/bugzilla/localconfig && \
-    ln -s /srv/bugzilla/data /var/www/html/bugzilla/data && \
+
+    mv /var/www/html/bugzilla/data/db /srv/bugzilla/ && \
+    ln -s /srv/bugzilla/db /var/www/html/bugzilla/data/ && \
+
+    mv /var/www/html/bugzilla/data/attachments /srv/bugzilla/ && \
+    ln -s /srv/bugzilla/attachments /var/www/html/bugzilla/data/ && \
+
+    mv /var/www/html/bugzilla/data/mining /srv/bugzilla/ && \
+    ln -s /srv/bugzilla/mining /var/www/html/bugzilla/data/ && \
+
+    mv /var/www/html/bugzilla/data/params.json /srv/bugzilla/ && \
+    ln -s /srv/bugzilla/params.json /var/www/html/bugzilla/data/ && \
 
 # Enable voting extension
     rm /var/www/html/bugzilla/extensions/Voting/disabled && \