sync devel to master (#60)

Author: piontec

.travis.yml

@@ -3,10 +3,10 @@ python:
   - "3.6"
 sudo: false
 before_install:
-  - pip install coveralls
+  - pip install coveralls pipenv
 install:
-  - pip install -r requirements-dev.txt
+  - pipenv install --deploy --ignore-pipfile --system --dev
 script:
   nosetests --with-coverage --cover-package docker_enforcer,dockerenforcer
 after_success:
-    - coveralls
+  - coveralls

Dockerfile

@@ -1,9 +1,10 @@
 FROM python:3-alpine
 MAINTAINER Łukasz Piątkowski <piontec@gmail.com>
 
-COPY requirements*.txt /opt/docker_enforcer/
+COPY Pipfile* /opt/docker_enforcer/
 WORKDIR /opt/docker_enforcer/
-RUN pip install -r requirements-prod.txt
+RUN pip install pipenv
+RUN pipenv install --deploy --ignore-pipfile --system
 COPY . /opt/docker_enforcer/
 
 ENTRYPOINT ["gunicorn"]

Dockerfile.windows

@@ -1,9 +1,10 @@
 FROM python:3-windowsservercore
 MAINTAINER Georgy Turevich <georgy.turevich@gmail.com>
 
-COPY requirements*.txt C:/docker_enforcer/
+COPY Pipfile* C:/docker_enforcer/
 WORKDIR C:/docker_enforcer/
-RUN pip install -r requirements-win.txt
+RUN pip install pipenv
+RUN pipenv --deploy --ignore-pipfile --system
 COPY . C:/docker_enforcer/
 
 ENV FLASK_APP docker_enforcer.py

Pipfile

@@ -0,0 +1,29 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+nose = "*"
+coverage = "*"
+
+[packages]
+appdirs = "*"
+click = "~=6.7"
+docker = "*"
+docker-pycreds = "*"
+itsdangerous = "*"
+pyparsing = "*"
+requests = "*"
+six = "*"
+Flask = "*"
+Jinja2 = "*"
+MarkupSafe = "*"
+Pygments = "*"
+Rx = "~=1.5"
+websocket_client = "*"
+Werkzeug = "*"
+gunicorn = "*"
+
+[requires]
+python_version = "3.7"

Pipfile.lock

@@ -4,7 +4,8 @@
 import copy
 from typing import Dict
 
-version = "0.8.16"
+
+version = "0.8.17"
 
 
 class Mode(Enum):