Merge pull request #56 from pisces-period/master

move pip requirements to a file, upgrade ubuntu

Author: jayjb

canarytokens/Dockerfile

@@ -1,39 +1,34 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04 as builder
+
 MAINTAINER Marco Slaviero <[email protected]>
+
 LABEL Description="This image provides the frontend site for Canarytokens" Vendor="Thinkst Applied Research" Version="1.4"
-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 && rm -rf /var/lib/apt/lists/*
+# setting the current directory
 WORKDIR /
-RUN pip install -U setuptools
-RUN pip install --upgrade pip
-RUN pip install --no-cache-dir pyOpenSSL==16.2.0
-RUN pip install --no-cache-dir Jinja2==2.9.4
-RUN pip install --no-cache-dir MarkupSafe==0.23
-RUN pip install --no-cache-dir Twisted==15.2.1
-RUN pip install --no-cache-dir cssselect==0.9.1
-RUN pip install --no-cache-dir docopt==0.4.0
-RUN pip install --no-cache-dir gnureadline==6.3.3
-RUN pip install --no-cache-dir httplib2==0.9.1
-RUN pip install --no-cache-dir lxml==3.4.4
-RUN pip install --no-cache-dir mandrill==1.0.57
-RUN pip install --no-cache-dir pytz==2015.4
-RUN pip install --no-cache-dir redis==2.10.3
-RUN pip install --no-cache-dir requests==2.20.0
-RUN pip install --no-cache-dir simplejson==3.7.3
-RUN pip install --no-cache-dir six==1.10.0
-RUN pip install --no-cache-dir twilio==4.4.0
-RUN pip install --no-cache-dir twill==1.8.0
-RUN pip install --no-cache-dir wsgiref==0.1.2
-RUN pip install --no-cache-dir zope.interface==4.1.2
-RUN pip install --no-cache-dir PyQRCode==1.2.1
-RUN pip install --no-cache-dir pypng==0.0.18
-RUN pip install --no-cache-dir htmlmin==0.1.10
-RUN pip install --no-cache-dir sendgrid==3.6.5
-RUN pip install --no-cache-dir service_identity
-
-RUN wget -O master.zip https://github.com/thinkst/canarytokens/archive/master.zip?step=22
-RUN unzip master.zip
-RUN mv /canarytokens-master/* /srv
-RUN rm -rf /canarytokens-master
+# uploading PIP requirements file into the base image
+COPY requirements.txt ./
+# removing PIP deprecation banners
+ENV PIP_DISABLE_PIP_VERSION_CHECK=1
+# concatenating RUN commands into a single image layer
+# 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 && \ 
+    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 && \
+    unzip master.zip && \
+    mv /canarytokens-master/* /srv && \
+    rm -rf /canarytokens-master
+# 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
+# copy the working directory from the previous image into the final image
+COPY --from=builder /srv /srv
+# seting the working environment
 WORKDIR /srv
 
-CMD echo "Please use the docker-compose setup described at https://github.com/thinkst/canarytokens-docker"
+CMD echo "Please use the docker-compose setup described at https://github.com/thinkst/canarytokens-docker"

canarytokens/requirements.txt

@@ -0,0 +1,24 @@
+pyOpenSSL==16.2.0
+Jinja2==2.9.4
+MarkupSafe==0.23
+Twisted==15.2.1
+cssselect==0.9.1
+docopt==0.4.0
+gnureadline==6.3.3
+httplib2==0.9.1
+lxml==3.4.4
+mandrill==1.0.57
+pytz==2015.4
+redis==2.10.3
+requests==2.20.0
+simplejson==3.7.3
+six==1.10.0
+twilio==4.4.0
+twill==1.8.0
+wsgiref==0.1.2
+zope.interface==4.1.2
+PyQRCode==1.2.1
+pypng==0.0.18
+htmlmin==0.1.10
+sendgrid==3.6.5
+service_identity