Move to IMAGE:$COMMIT and try 5.2 branch (same as synthesis)

Author: Kai Hendry

AWS-docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
     bugzilla:
-        image: uneet/bugzilla-customisation
+        image: uneet/bugzilla-customisation:$COMMIT
         restart: on-failure
         mem_reservation: 1g
         mem_limit: 3g  # assuming a t2.medium host with 4GB of RAM
@@ -17,7 +17,6 @@ services:
             MYSQL_USER: ${MYSQL_USER}
             MYSQL_PASSWORD: ${MYSQL_PASSWORD}
             PARAMS_URL: ${PARAMS_URL}
-            COMMIT: ${COMMIT}
         logging:
             driver: awslogs
             options:

Dockerfile

@@ -16,7 +16,9 @@ RUN a2dissite 000-default
 
 # END STUFF FOR BASE IMAGE
 
-RUN git clone -b synthesis https://github.com/bugzilla/bugzilla.git /opt/bugzilla
+ARG BUGZILLA_BRANCH="5.2"
+
+RUN git clone -b $BUGZILLA_BRANCH https://github.com/bugzilla/bugzilla.git /opt/bugzilla
 WORKDIR /opt/bugzilla
 COPY gen-cpanfile.pl /usr/local/bin/gen-cpanfile.pl
 RUN perl Build.PL && \

start

@@ -37,7 +37,6 @@ chown -R :www-data /opt/bugzilla/data
 BZ_COMMIT=$(git --git-dir=/opt/bugzilla/.git describe --always)
 echo BZ_COMMIT: $BZ_COMMIT
 
-#TEMPLATE=/opt/bugzilla/template/en/custom/index.html.tmpl
 TEMPLATE=/opt/bugzilla/template/en/custom/index.html.tmpl
 if ! grep -q "header_addl_info" $TEMPLATE
 then