Refactor code and add missing command for production environment Dockerfile

Author: lopezco

.env

@@ -26,7 +26,7 @@ wheels/
 MANIFEST
 
 # PyInstaller
-#  Usually these files are written by a python script from a template
+#  Usually these files are written by a src script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec

.gitignore

@@ -20,9 +20,9 @@ Make sure that you have a model in the main directory.
 You can launch the example using the following line in order to create a quick
 classification model.
 ```bash
-$ python ./python/example/build_linear_binary.py
+$ python ./example/build_linear_binary.py
 ```
-or one of the scripts in the `python/example` folder
+or one of the scripts in the `./example` folder
 
 ### Configuration
 
@@ -72,8 +72,8 @@ $ docker-compose -f docker-compose-production.yml up
 
 Create the environment
 ```bash
-$ conda create -n flask_ml_template python=3
-$ conda activate flask_ml_template
+$ conda create -n flask_ml python=3
+$ conda activate flask_ml
 ```
 Install requirements
 ```bash
@@ -87,8 +87,9 @@ $ python service.py
 
 ## Usage of the API  
 
-This example considers that the API was launched with the default parameters
-(`localhost` at port `5000`) and its calling the example model.
+This example considers that the API was launched locally without docker and 
+with the default parameters (`localhost` at port `5000`) and its calling 
+the example model.
 
 For `/predict` endpoint the JSON string in the payload of hte request can take
 two forms:

README.md

@@ -1,13 +1,13 @@
 version: '3'
 services:
   flask-ml:
-    container_name: flask-ml-${VERSION}
+    container_name: flask-ml
     build:
       context: .
       dockerfile: ./docker/Dockerfile-production
-    image: flask-ml:${VERSION}
+    image: flask-ml
     env_file:
-      - ./docker/variables-production.env
+      - ./docker/production.env
     restart: always
     ports:
-      - "${PORT_EXTERNAL}:${PORT}"
+      - "3333:5000"

docker-compose-production.yml

@@ -1,13 +1,13 @@
 version: '3'
 services:
   flask-ml:
-    container_name: flask-ml-${VERSION}
+    container_name: flask-ml
     build:
       context: .
       dockerfile: ./docker/Dockerfile
-    image: flask-ml:${VERSION}
+    image: flask-ml
     env_file:
-      - ./docker/variables.env
+      - ./docker/.env
     restart: always
     ports:
-      - "${PORT_EXTERNAL}:${PORT}"
+      - "33333:5000"

docker-compose.yml

@@ -0,0 +1,3 @@
+DEBUG=1
+MODEL_NAME=model.joblib
+MODEL_TYPE=SKLEARN_MODEL

docker/.env

@@ -1,7 +1,5 @@
 FROM python:3
 
-ENV ENVIRONMENT local
-
 WORKDIR /usr/src/app
 
 # Copy and install service requirements

docker/Dockerfile

@@ -1,7 +1,5 @@
 FROM tiangolo/uwsgi-nginx-flask:python3.6
 
-ENV ENVIRONMENT production
-
 WORKDIR /app/
 
 # Copy and install service requirements
@@ -14,3 +12,5 @@ RUN pip install -r ./requirements.txt
 
 # Copy code and model
 COPY . .
+
+CMD gunicorn -b 0.0.0.0:5000 service --timeout 300

docker/Dockerfile-production

@@ -0,0 +1,3 @@
+DEBUG=0
+MODEL_NAME=model.joblib
+MODEL_TYPE=SKLEARN_MODEL