From 7e3f62ad7b388234b821f51e1a896a99c4806b49 Mon Sep 17 00:00:00 2001 From: MagicJF Date: Wed, 6 Jul 2022 20:34:44 +0200 Subject: [PATCH] latest --- docker-compose.yml | 10 ++++++---- flask-app/app.py | 15 +++++++++++++++ setup-docker.sh | 4 ++-- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7f20b72..ff9a00b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: es: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 @@ -10,8 +10,10 @@ services: volumes: - esdata1:/usr/share/elasticsearch/data web: - image: prakhar1989/foodtrucks-web + build: . command: python3 app.py + environment: + - DEBUG=True depends_on: - es ports: @@ -19,5 +21,5 @@ services: volumes: - ./flask-app:/opt/flask-app volumes: - esdata1: - driver: local + esdata1: + driver: local diff --git a/flask-app/app.py b/flask-app/app.py index 3df1dc1..3320727 100644 --- a/flask-app/app.py +++ b/flask-app/app.py @@ -61,6 +61,21 @@ def test_es(): resp["msg"] = "Unable to reach ES" return jsonify(resp) + +@app.route('/hello') +def hello(): + return "hello world!" + +@app.route('/asura') +def asura(): + return "ASURA STRIKE!!!!!" + +@app.route('/hi') +def hi(): + return "hi world" + + + @app.route('/search') def search(): key = request.args.get('q') diff --git a/setup-docker.sh b/setup-docker.sh index 7c7afb3..53079aa 100755 --- a/setup-docker.sh +++ b/setup-docker.sh @@ -1,7 +1,7 @@ #!/bin/bash # build the flask container -docker build -t prakhar1989/foodtrucks-web . +docker build -t magicjf/foodtrucks-web . # create the network docker network create foodtrucks-net @@ -10,4 +10,4 @@ docker network create foodtrucks-net docker run -d --name es --net foodtrucks-net -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:6.3.2 # start the flask app container -docker run -d --net foodtrucks-net -p 5000:5000 --name foodtrucks-web prakhar1989/foodtrucks-web +docker run -d --net foodtrucks-net -p 5000:5000 --name foodtrucks-web magicjf/foodtrucks-web