Add changes for packages bump in canarytokens repo

Author: jayjb

canarytokens/Dockerfile

@@ -13,16 +13,16 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 # installing PIP requirements from requirements.txt file
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates \
     wget python-pip unzip osslsigncode gcc python-dev libreadline-dev \
-    libncurses5-dev libffi-dev gcc patch make libxslt-dev libxml2-dev \ 
-    libz-dev fortune-mod fortunes libssl-dev && \ 
+    libncurses5-dev libffi-dev gcc patch make libxslt-dev libxml2-dev \
+    libz-dev fortune-mod fortunes libssl-dev && \
     rm -rf /var/lib/apt/lists/* && \
     pip install -U setuptools && \
     pip install --upgrade pip && \
     pip install --no-cache-dir -r requirements.txt && \
-    wget -O master.zip https://github.com/thinkst/canarytokens/archive/master.zip?step=22 && \
+    wget -O master.zip https://github.com/thinkst/canarytokens/archive/upgrade.zip?step=5 && \
     unzip master.zip && \
-    mv /canarytokens-master/* /srv && \
-    rm -rf /canarytokens-master
+    mv /canarytokens-upgrade/* /srv && \
+    rm -rf /canarytokens-upgrade
 # discarding the build-stage image and adding a new one
 # with only the necessary binaries/libraries to run the app
 FROM builder as canary-tokens

canarytokens/requirements.txt

@@ -1,7 +1,7 @@
 pyOpenSSL==16.2.0
-Jinja2==2.9.4
+Jinja2==2.11.0
 MarkupSafe==0.23
-Twisted==15.2.1
+Twisted==19.10.0
 cssselect==0.9.1
 docopt==0.4.0
 gnureadline==6.3.3
@@ -11,12 +11,12 @@ mandrill==1.0.57
 pytz==2015.4
 redis==2.10.3
 requests==2.20.0
-simplejson==3.7.3
+simplejson==3.16.0
 six==1.10.0
 twilio==4.4.0
 twill==1.8.0
 wsgiref==0.1.2
-zope.interface==4.1.2
+zope.interface==4.6.0
 PyQRCode==1.2.1
 pypng==0.0.18
 htmlmin==0.1.10

docker-compose.yml

@@ -14,7 +14,7 @@ services:
     links:
      - redis
     env_file:
-     - frontend.env
+     - frontend.env.dist
     volumes:
     - ./uploads:/uploads/
     - log-volume:/logs
@@ -31,7 +31,7 @@ services:
     links:
      - redis
     env_file:
-     - switchboard.env
+     - switchboard.env.dist
     volumes_from:
     - frontend
     container_name: switchboard