Use jingo-minify 0.6.0 release. (#4732)

* Use jingo-minify 0.6.0 release.

* Use a newer version of git.

* @EnTeQuAk review.

* @jasonthomas review.

* Too many spaces.

Dockerfile

@@ -5,6 +5,7 @@ RUN touch /addons-server-centos7-container
 
 ADD docker/mysql-community.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
 ADD docker/nodesource.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-nodesource
+ADD docker/git.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-git
 
 # For mysql-python dependencies
 ADD docker/mysql.repo /etc/yum.repos.d/mysql.repo
@@ -12,6 +13,10 @@ ADD docker/mysql.repo /etc/yum.repos.d/mysql.repo
 # This is temporary until https://bugzilla.mozilla.org/show_bug.cgi?id=1226533
 ADD docker/nodesource.repo /etc/yum.repos.d/nodesource.repo
 
+# For git dependencies
+ADD docker/git.repo /etc/yum.repos.d/git.repo
+
+# Upgrade git
 RUN yum install -y \
         # Supervisor is being used to start and keep our services running
         supervisor \

Dockerfile.deploy

@@ -9,8 +9,11 @@ ENV OLYMPIA_UID=9500
 RUN useradd -u ${OLYMPIA_UID} -s /sbin/nologin olympia
 
 ADD docker/nodesource.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-nodesource
+ADD docker/git.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-git
 ADD docker/epel.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+
 ADD docker/nodesource.repo docker/epel.repo /etc/yum.repos.d/
+ADD docker/git.repo /etc/yum.repos.d/git.repo
 
 RUN yum install -y                                          \
         gcc-c++                                             \
@@ -65,4 +68,3 @@ RUN npm install \
     && DJANGO_SETTINGS_MODULE='settings_local' python manage.py collectstatic --noinput
 
 RUN rm -f settings_local.py settings_local.pyc
-

docker/git.gpg.key

@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+mQGiBEt9pngRBADyWzrKQ8U9wsTX5cxZ0TEFhsgnLdGJhpIAm+1N0rVJfyertWVm
+CbbWFmC5YfpwGd+ajci4/NfoI+W+UphyJD9LBKn4nH01no5hvYJkjljeJ6jSZgGp
+dzFuG7J9KnKs4uWYrpPr9D4zLTO03U0QD2yZ8FojPkhdWAxswJBV574hPwCgrPfD
+B7RKd+r8P7ip5GnalUMBcOED/3OqZuhqhwHrKVSzKXrTI2f119kspSflJDVb/MdY
+10VAq0IZjaBJ7MjqRd3YvLt29L0T6bJzWPNr8dIA0GjqTWfdrzlV/q22XP/thUO3
+WEwJmPTHySKwQRlIF4Smxyxf4K/V0YVkfkYMXdR+O2KLavH7A+giOzJkn7c04/OS
+YEGaBAC+PfEB5KXrULLC9DczQ1IqeDTG+Wg/CsiEEPpsqmmlBtkdhZStzabnM+JE
+00eyEpFx9iCIv3gSpzq1rq28lIkImW0oRrl6LjWEZifNGsFL5HXo77H2Y6XtROge
+MN88v9bnQ3zuHLhj7jWp5/lVxFokASdTmJpB27FaDiokQOhxzLRXV0FOZGlzY28g
+KGh0dHA6Ly9XQU5kaXNjby5jb20gLSBXZSBNYWtlIFNvZnR3YXJlIEhhcHBlbi4u
+LikgPHNvZnR3YXJlLWtleUB3YW5kaXNjby5jb20+iGMEExECACMCGwMGCwkIBwMC
+BBUCCAMEFgIDAQIeAQIXgAUCUSYMDwIZAQAKCRDp8OkiO78HemVSAJ935CdoQxpW
+cfQ+eSBBw+g0E8iFYwCeIH+Ufc0WjgUPeCAZxhPemIG+DXC5Ag0ES32miBAIAM3J
+9bpV9GsHFTXfFisvbwilnWOrw2eUnjebWg9qxACHTSHl5AH2kqWNjMvoCcRcezwj
+8OPMPGNdxrd42slb1G0NB5udNqCJZrhAsnMAY05DTEcBMcD6K7HUnJMpoVNTo8mh
+6dhKeYJ6AIMrW1rtogOuNxCJ0XvdbIfsBErvG7X1cQArsHuvsGYB1TJWG+Kqv0UT
+jc0pk7sa7Jkc/zPbUIyEd/N4Je39YVfpo5439Hxh088ha/1BPA8w+k++jge0m60I
+r4kf5zxFkcnaKHFi3RPpBJHbDPqzLsqLF43OSxudD0g1owzVVzbxFE49dr/G5BdZ
+V8tYhfGenf68nWiKpl8AAwUH/ibBbb1uJWWejxiKwWR0PZqXl6ABG7E5A6np592y
++zhnZNE0s+0xnZKrjVioZSgL0ikrRWU5h74b8ONaHXDu4yNV9tYDmGcbQ8pu/Xxk
+oijZLriMJpLgGKUChwX+daYzGzuQwINOggaVbN6lhVojNzr1CioSpzVZABG8BrFm
++Wet0y9cSFD0GpbVJ8IuHHNvevhqF0O4WKOT8gxb0wVUVjplsYqrFHNt6zd/e/PR
+F0mowHVqMISYzF24rgcOsv8UWSmTvTeqTkY/zSRkEYylHceFK67exWZvAOgQPcWq
+3OyDpEDiFLnTOw78TksTqk5Dz8MYelGqjfM8372lF8HdZT6ISQQYEQIACQUCS32m
+iAIbDAAKCRDp8OkiO78HelY9AJ9XhUDIVLJKe8YGgTzlkP/mxWAyhwCeNZ2ojkl7
+Qb8MEwC9QJNuFjgI8HE=
+=Dck0
+-----END PGP PUBLIC KEY BLOCK-----

docker/git.repo

@@ -0,0 +1,6 @@
+[git]
+name=Git Repo
+baseurl=https://s3-us-west-2.amazonaws.com/net-mozaws-prod-us-west-2-ops-rpmrepo-mirror/git/7/x86_64
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-git

requirements/prod.txt

@@ -5,9 +5,6 @@ Babel==2.3.4 \
 Django==1.8.17 \
     --hash=sha256:87618c1011712faf7400e2a73315f4f4c3a6e68ab6309c3e642d5fef73d66d9e \
     --hash=sha256:021bd648fcf454027063187e63a1ab4136c6929430ef5dfbe36235f60015eb07 # pyup: >=1.8,<1.9
-# And upgrade breaks jingo minify and potentially other things.
-GitPython==0.1.7 \
-    --hash=sha256:03754bc7b256397c1b646e5048e2291590f5080171adb8b00f4e2d7384c76eee # pyup: ==0.1.7
 # Jinja2 is required by Sphinx
 Jinja2==2.8.1 \
     --hash=sha256:3997cf273f1424207c60d5895264f74483fce72702f15a7cd51a8551d43663ca \
@@ -236,6 +233,9 @@ isodate==0.5.4 \
 jingo==0.9.0 \
     --hash=sha256:12a983286519303c6afd3da6f0a7e1859e69effb5fe46109424cdfca382bea56 \
     --hash=sha256:37de5435622d05763bc55d1a3d0a7edcf998ece9e6048bb470db431d1aa83c3a
+jingo_minify==0.6.0 \
+    --hash=sha256:5b804282fb5b00738a279633b2f1943aefbc0b9e3c5b8c12eeade6d96ce262f0 \
+    --hash=sha256:f74ce033cb25852d936679ec56fde55455a1812a151494eb93436734fe9e3a55
 # kombu is required by celery
 kombu==3.0.35 \
     --hash=sha256:2c59a5e087d5895675cdb4d6a38a0aa147f0411366e68330a76e480ba3b25727 \

requirements/prod_without_hash.txt

@@ -1,6 +1,3 @@
-# Temporary fork.
--e git+https://github.com/yohanboniface/jingo-minify.git@amo.2014.09.03#egg=jingo_minify
-
 ## Forked.
 -e git+https://github.com/EnTeQuAk/django-cache-machine@1cac98a3e1dcc3cb654665cc67b6b15ab60d62c4#egg=django-cache-machine