From 2652caaf60460fd6b97c092cdcd3b5b99c23cb2d Mon Sep 17 00:00:00 2001 From: ajeetraina Date: Mon, 7 Mar 2022 11:45:07 +0530 Subject: [PATCH] Added Flask/Redis Signed-off-by: ajeetraina --- flask-redis/Dockerfile | 5 +++++ {flask => flask-redis}/README.md | 0 flask-redis/app.py | 15 ++++++++++++++ {flask => flask-redis}/app/Dockerfile | 0 {flask => flask-redis}/app/app.py | 0 {flask => flask-redis}/app/requirements.txt | 0 {flask => flask-redis}/docker-compose.yaml | 0 flask-redis/docker-compose.yml | 14 +++++++++++++ flask-redis/requirements.txt | 2 ++ nginx-flask-redis/docker-compose.yml | 23 --------------------- nginx-flask-redis/nginx/Dockerfile | 3 --- nginx-flask-redis/nginx/sites-enabled/app | 14 ------------- nginx-flask-redis/web/Dockerfile | 7 ------- nginx-flask-redis/web/app/app.py | 16 -------------- nginx-flask-redis/web/app/config.py | 16 -------------- nginx-flask-redis/web/requirements.txt | 3 --- nginx-flask-redis/web/start.sh | 3 --- 17 files changed, 36 insertions(+), 85 deletions(-) create mode 100644 flask-redis/Dockerfile rename {flask => flask-redis}/README.md (100%) create mode 100644 flask-redis/app.py rename {flask => flask-redis}/app/Dockerfile (100%) rename {flask => flask-redis}/app/app.py (100%) rename {flask => flask-redis}/app/requirements.txt (100%) rename {flask => flask-redis}/docker-compose.yaml (100%) create mode 100644 flask-redis/docker-compose.yml create mode 100644 flask-redis/requirements.txt delete mode 100644 nginx-flask-redis/docker-compose.yml delete mode 100644 nginx-flask-redis/nginx/Dockerfile delete mode 100644 nginx-flask-redis/nginx/sites-enabled/app delete mode 100644 nginx-flask-redis/web/Dockerfile delete mode 100644 nginx-flask-redis/web/app/app.py delete mode 100644 nginx-flask-redis/web/app/config.py delete mode 100644 nginx-flask-redis/web/requirements.txt delete mode 100644 nginx-flask-redis/web/start.sh diff --git a/flask-redis/Dockerfile b/flask-redis/Dockerfile new file mode 100644 index 0000000..44566f9 --- /dev/null +++ b/flask-redis/Dockerfile @@ -0,0 +1,5 @@ +FROM python +ADD . /code +WORKDIR /code +RUN pip install -r requirements.txt +CMD python app.py diff --git a/flask/README.md b/flask-redis/README.md similarity index 100% rename from flask/README.md rename to flask-redis/README.md diff --git a/flask-redis/app.py b/flask-redis/app.py new file mode 100644 index 0000000..04aaf44 --- /dev/null +++ b/flask-redis/app.py @@ -0,0 +1,15 @@ +# compose_flask/app.py +from flask import Flask +from redis import Redis + +app = Flask(__name__) +redis = Redis(host='redis', port=6379) + +@app.route('/') +def hello(): + redis.incr('hits') + return 'This webpage has been viewed %s time(s).' % redis.get('hits') + + +if __name__ == "__main__": + app.run(host="0.0.0.0", debug=True) diff --git a/flask/app/Dockerfile b/flask-redis/app/Dockerfile similarity index 100% rename from flask/app/Dockerfile rename to flask-redis/app/Dockerfile diff --git a/flask/app/app.py b/flask-redis/app/app.py similarity index 100% rename from flask/app/app.py rename to flask-redis/app/app.py diff --git a/flask/app/requirements.txt b/flask-redis/app/requirements.txt similarity index 100% rename from flask/app/requirements.txt rename to flask-redis/app/requirements.txt diff --git a/flask/docker-compose.yaml b/flask-redis/docker-compose.yaml similarity index 100% rename from flask/docker-compose.yaml rename to flask-redis/docker-compose.yaml diff --git a/flask-redis/docker-compose.yml b/flask-redis/docker-compose.yml new file mode 100644 index 0000000..585c32e --- /dev/null +++ b/flask-redis/docker-compose.yml @@ -0,0 +1,14 @@ +version: '2' +services: + redis: + image: redislabs/redismod + ports: + - '6379:6379' + web: + build: . + ports: + - "5000:5000" + volumes: + - .:/code + depends_on: + - redis diff --git a/flask-redis/requirements.txt b/flask-redis/requirements.txt new file mode 100644 index 0000000..1a5dc97 --- /dev/null +++ b/flask-redis/requirements.txt @@ -0,0 +1,2 @@ +flask +redis diff --git a/nginx-flask-redis/docker-compose.yml b/nginx-flask-redis/docker-compose.yml deleted file mode 100644 index 323a38b..0000000 --- a/nginx-flask-redis/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: '3.6' - -services: - redis: - image: redislabs/redis - ports: - - '6379:6379' - - web: - build: - context: ./web/ - ports: - - "5000:5000" - links: - - redis - - nginx: - restart: always - build: ./nginx/ - ports: - - "80:80" - links: - - web diff --git a/nginx-flask-redis/nginx/Dockerfile b/nginx-flask-redis/nginx/Dockerfile deleted file mode 100644 index 5f6dede..0000000 --- a/nginx-flask-redis/nginx/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM nginx:alpine -RUN rm /etc/nginx/conf.d/default.conf -ADD sites-enabled/app /etc/nginx/conf.d/default.conf diff --git a/nginx-flask-redis/nginx/sites-enabled/app b/nginx-flask-redis/nginx/sites-enabled/app deleted file mode 100644 index 1780ab2..0000000 --- a/nginx-flask-redis/nginx/sites-enabled/app +++ /dev/null @@ -1,14 +0,0 @@ -server { - - listen 80; - server_name 0.0.0.0; - charset utf-8; - - location / { - proxy_pass http://web:8000; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } - -} diff --git a/nginx-flask-redis/web/Dockerfile b/nginx-flask-redis/web/Dockerfile deleted file mode 100644 index de551ca..0000000 --- a/nginx-flask-redis/web/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM python - -COPY . / - -RUN pip install -r requirements.txt && pip install gunicorn -RUN /usr/local/bin/python -m pip install --upgrade pip -ENTRYPOINT ["/start.sh"] diff --git a/nginx-flask-redis/web/app/app.py b/nginx-flask-redis/web/app/app.py deleted file mode 100644 index 6ff2bf9..0000000 --- a/nginx-flask-redis/web/app/app.py +++ /dev/null @@ -1,16 +0,0 @@ - -import os -import socket - -from flask import Flask -from redis import Redis - - -app = Flask(__name__) -redis = Redis(host=os.environ.get('REDIS_HOST', 'redis'), port=6379) - - -@app.route('/') -def hello(): - redis.incr('hits') - return 'Hi Docker! You have seen %s times and your system is %s.\n' % (redis.get('hits'),socket.gethostname()) diff --git a/nginx-flask-redis/web/app/config.py b/nginx-flask-redis/web/app/config.py deleted file mode 100644 index 97e201f..0000000 --- a/nginx-flask-redis/web/app/config.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- - -import multiprocessing -import os - -from distutils.util import strtobool - - -bind = os.getenv('WEB_BIND', '0.0.0.0:8000') -accesslog = '-' -access_log_format = "%(h)s %(l)s %(u)s %(t)s '%(r)s' %(s)s %(b)s '%(f)s' '%(a)s' in %(D)sµs" # noqa: E501 - -workers = int(os.getenv('WEB_CONCURRENCY', multiprocessing.cpu_count() * 2)) -threads = int(os.getenv('PYTHON_MAX_THREADS', 1)) - -reload = bool(strtobool(os.getenv('WEB_RELOAD', 'false'))) diff --git a/nginx-flask-redis/web/requirements.txt b/nginx-flask-redis/web/requirements.txt deleted file mode 100644 index 17c24ec..0000000 --- a/nginx-flask-redis/web/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -Flask==2.0.3 -redis==4.1.4 - diff --git a/nginx-flask-redis/web/start.sh b/nginx-flask-redis/web/start.sh deleted file mode 100644 index 19b0075..0000000 --- a/nginx-flask-redis/web/start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -gunicorn -c app/config.py app.app:app