From b1cf5cbc50ca9e569bbbae8e140f1dd02da70825 Mon Sep 17 00:00:00 2001 From: grantbirki Date: Sun, 14 Mar 2021 12:26:14 -0700 Subject: [PATCH] updating main documentation to include link to sample and adding newlines Signed-off-by: grantbirki Signed-off-by: Grant Birkinbine --- README.md | 1 + nginx-wsgi-flask/Makefile | 2 +- nginx-wsgi-flask/docker-compose.yaml | 2 +- nginx-wsgi-flask/flask/app.py | 2 +- nginx-wsgi-flask/nginx/nginx.conf | 2 +- nginx-wsgi-flask/nginx/start.sh | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8c2cc0f..d385363 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ a MySQL database. application with Nginx proxy and a Mongo database. - [`NGINX / Flask / MySQL`](https://github.com/docker/awesome-compose/tree/master/nginx-flask-mysql) - Sample Python/Flask application with an Nginx proxy and a MySQL database. +- [`NGINX / WSGI / Flask`](https://github.com/docker/awesome-compose/tree/master/nginx-wsgi-flask) - Sample web framework stack using NGINX as a reverse proxy and WSGI to interface requests to a Flask backend. - [`NGINX / Go`](https://github.com/docker/awesome-compose/tree/master/nginx-golang) - Sample Nginx proxy with a Go backend. - [`React / Spring / MySQL`](https://github.com/docker/awesome-compose/tree/master/react-java-mysql) - Sample React application with a Spring backend and a MySQL database. diff --git a/nginx-wsgi-flask/Makefile b/nginx-wsgi-flask/Makefile index 74f7ce4..9083d69 100644 --- a/nginx-wsgi-flask/Makefile +++ b/nginx-wsgi-flask/Makefile @@ -4,4 +4,4 @@ make build: docker-compose rm -fs echo "[#] Building docker containers" - docker-compose up --build -d \ No newline at end of file + docker-compose up --build -d diff --git a/nginx-wsgi-flask/docker-compose.yaml b/nginx-wsgi-flask/docker-compose.yaml index a2c48f5..4d9a28c 100644 --- a/nginx-wsgi-flask/docker-compose.yaml +++ b/nginx-wsgi-flask/docker-compose.yaml @@ -29,4 +29,4 @@ services: interval: 10s timeout: 10s retries: 3 - command: gunicorn -w 3 -t 60 -b 0.0.0.0:8000 app:app \ No newline at end of file + command: gunicorn -w 3 -t 60 -b 0.0.0.0:8000 app:app diff --git a/nginx-wsgi-flask/flask/app.py b/nginx-wsgi-flask/flask/app.py index db2af90..db47c3c 100644 --- a/nginx-wsgi-flask/flask/app.py +++ b/nginx-wsgi-flask/flask/app.py @@ -24,4 +24,4 @@ def info(): @app.route('/flask-health-check') def flask_health_check(): - return "success" \ No newline at end of file + return "success" diff --git a/nginx-wsgi-flask/nginx/nginx.conf b/nginx-wsgi-flask/nginx/nginx.conf index d72a39b..e6700a3 100644 --- a/nginx-wsgi-flask/nginx/nginx.conf +++ b/nginx-wsgi-flask/nginx/nginx.conf @@ -47,4 +47,4 @@ http { include /etc/nginx/conf.d/*.conf; -} \ No newline at end of file +} diff --git a/nginx-wsgi-flask/nginx/start.sh b/nginx-wsgi-flask/nginx/start.sh index d3c7ac2..39f666d 100644 --- a/nginx-wsgi-flask/nginx/start.sh +++ b/nginx-wsgi-flask/nginx/start.sh @@ -1,2 +1,2 @@ #!/bin/bash -envsubst '$FLASK_SERVER_ADDR' < /tmp/default.conf > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;' \ No newline at end of file +envsubst '$FLASK_SERVER_ADDR' < /tmp/default.conf > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'