Merge pull request #31 from rwblair/nginx_updates

Nginx updates

.gitignore

@@ -90,3 +90,5 @@ ENV/
 
 # OS generated files
 .DS_Store
+
+.ssl

README.md

@@ -1 +1,28 @@
-# mriqcwebapi
+Built on:
+* [Python Eve](http://python-eve.org/)
+* [Python Gunicorn](http://gunicorn.org/)
+* [Nginx](https://nginx.org/)
+* [Docker](https://www.docker.com/)
+
+## Run
+Example of commands to run locally to start:
+```sh
+$ cd dockereve-master/
+$ docker-compose build
+$ docker-compose up -d
+$ curl -i -H "Content-Type: application/json" http://localhost/api/v1/T1w
+```
+
+Swagger API documentation available at `http://localhost/docs`.
+
+## Environment variables in Docker
+To properly run the file dockereve-master/.env needs to be populated the following are the default values:
+```
+MONGODB_HOST=mongodb
+MONGODB_PORT=27017
+
+API_TOKEN=<secret_token>
+API_URL=http://localhost/docs/api
+```
+
+If docker is running natively these values should work, otherwise API_URL may need to be updated from localhost accordingly.

circle.yml

@@ -15,6 +15,9 @@ machine:
 
 test:
   pre:
+    - mkdir dockereve-master/nginx/.ssl
+    - touch dockereve-master/nginx/.ssl/mriqcep.crt
+    - touch dockereve-master/nginx/.ssl/mriqcep.key
     - docker-compose -f dockereve-master/docker-compose.yml build
   override:
     - docker-compose -f dockereve-master/docker-compose.yml up -d

dockereve-master/docker-compose.yml

@@ -1,10 +1,14 @@
 nginx:
+    image: nginx
     restart: always
-    build: ./nginx/
     ports:
         - 80:80
+        - 443:443
     volumes:
         - /www/static
+        - ./uwsgi_params.par:/etc/nginx/uwsgi_params.par:ro
+        - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+        - ./nginx/.ssl:/etc/ssl/certs/
     volumes_from:
         - eve
     links:

dockereve-master/eve-app/Dockerfile

@@ -6,6 +6,7 @@ ADD . /usr/src/app
 
 RUN pip3 install -r requirements.txt
 RUN pip3 install pytest
+RUN sed -i 's/\[scheme\]/\["https"\]/' /usr/local/lib/python3.4/site-packages/eve_swagger/objects.py
 
 #EXPOSE 5000
 #CMD ["python3", "server.py"]

dockereve-master/eve-app/app.py

@@ -3,6 +3,7 @@
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 
 import os
+import socket
 
 from eve import Eve
 from eve.auth import TokenAuth

dockereve-master/nginx/nginx.conf

@@ -0,0 +1,40 @@
+user  nginx;
+worker_processes  1;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    server {
+        listen 80;
+        listen [::]:80 ;
+        server_name 34.224.227.208;
+
+        location = /docs/api {
+            proxy_pass http://eve:5000/docs/api;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+
+        location /api {
+            proxy_pass http://eve:5000;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+
+        location / {
+            proxy_pass http://swagger_ui:8080/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+        #return 301 https://$host$request_uri;
+    }
+}