Run with uWSGI usage

.docker/uwsgi.ini

@@ -0,0 +1,12 @@
+[uwsgi]
+chdir=/app
+pythonpath=/app
+virtualenv=/.venv
+wsgi-file=content_store/api/wsgi.py
+callable = APP
+
+http=0.0.0.0:80
+master=True
+processes=4
+max-requests=5000
+#logto = uwsgi.log

.travis.yml

@@ -8,10 +8,10 @@ install:
     - docker-compose build
 
 before_script:
-    - docker-compose up -d web
+    - docker-compose up -d app
 
 script:
-    - docker-compose run web ./project-tests.sh
+    - docker-compose run app ./project-tests.sh
     - ./.docker/smoke-tests.sh
 
 after_script:

Dockerfile

@@ -16,4 +16,4 @@ COPY project-tests.sh \
     ./
 # if there is work to be done here, move the venv copying after it
 
-CMD ["python"]
+CMD ["uwsgi", "--ini=uwsgi.ini"]

Dockerfile.venv

@@ -1,11 +1,14 @@
 ARG python_base_image_tag
 FROM python:${python_base_image_tag}
-RUN pip install --no-cache-dir --only-binary --upgrade pipenv
 
-RUN apk --no-cache add linux-headers g++
+# uwsgi and pylint build dependencies
+RUN apk add --no-cache gcc g++ libc-dev linux-headers \
+ && pip install --no-cache-dir --only-binary --upgrade pipenv \
+ && python -m venv /.venv
 
-COPY Pipfile Pipfile.lock ./
+ENV VIRTUAL_ENV=/.venv PYTHONUSERBASE=/.venv PATH=/.venv/bin:$PATH
+COPY Pipfile Pipfile.lock /pipfiles/
 
 ARG pipenv_dev_arg
-ENV PIPENV_VENV_IN_PROJECT=1 
+WORKDIR /pipfiles
 RUN pipenv install ${pipenv_dev_arg} --deploy --ignore-pipfile

Pipfile

@@ -10,7 +10,8 @@ pylint = "~=2.1"
 
 [packages]
 flask = "~=1.0.2"
-flask-sqlalchemy = "*"
+flask-sqlalchemy = "~=2.3.2"
+uwsgi = "~=2.0.17"
 
 [requires]
 python_version = "3.6"

README.md

@@ -14,18 +14,25 @@ docker-compose up -d
 ```
 
 Running the application locally (to be removed when Docker becomes the primary development mode):
-For non-development configuration set APP_SETTINGS environment variable to the module to use. Defaults to `content_store.api.config.DevelopmentConfig`
 
 ```
 FLASK_APP=content_store/api/api.py PYTHONPATH=. pipenv run flask run
 ```
 
+For non-development configuration set APP_SETTINGS environment variable to the module to use. Defaults to `content_store.api.config.DevelopmentConfig`.
+
 Checking the application is responding:
 ```
 curl -v localhost:5000/ping
 ```
 
 Running tests:
 ```
-docker-compose run web python -m pytest
+docker-compose run app python -m pytest
+```
+
+Installing a new package:
+```
+docker-compose build
+docker-compose run --rm venv /bin/sh -c 'pipenv install requests && pipenv lock'
 ```

content_store/api/wsgi.py

@@ -0,0 +1,3 @@
+from content_store.api.api import create_app
+
+APP = create_app()

docker-compose.override.yml

@@ -0,0 +1,6 @@
+version: '3'
+
+services:
+    venv:
+        volumes:
+            - ./:/pipfiles/

docker-compose.yml

@@ -9,19 +9,18 @@ services:
                 pipenv_dev_arg: ${PIPENV_DEV_ARG}
                 python_base_image_tag: ${PYTHON_BASE_IMAGE_TAG}
         image: libero/content-store_venv:${IMAGE_TAG}
-    web:
+    app:
         build:
             context: .
             dockerfile: Dockerfile
             args:
                 image_tag: ${IMAGE_TAG}
                 python_base_image_tag: ${PYTHON_BASE_IMAGE_TAG}
         image: libero/content-store:${IMAGE_TAG}
-        environment:
-            - FLASK_APP=content_store/api/api.py
-        command: flask run --host=0.0.0.0
         stop_signal: SIGINT
+        volumes:
+            - ./.docker/uwsgi.ini:/app/uwsgi.ini
         ports:
-            - 5000:5000
+            - 5000:80
         depends_on:
             - venv