From 7082fd0fd2a6c2b58d1fa9d7964b1ce8e2f7762d Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Tue, 1 Nov 2016 20:23:42 -0500 Subject: [PATCH] Adds docker-compose file and fixes upload folder for docker container --- docker-compose.yml | 26 ++++++++++++++++++++++++++ web_db/flask/app/__init__.py | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..7b4fbf2 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,26 @@ +version : '2' +services: + web_db: + image: henrypump/logger/web_db + ports: + - "443:5000" + networks: + poconsole: + ipv4_address: 10.10.10.10 + daq_sample: + image: henrypump/logger/daq_sample + networks: + - poconsole + depends_on: + - web_db + + +networks: + poconsole: + driver: bridge + driver_opts: + com.docker.network.enable_ipv4: "true" + ipam: + driver: default + config: + - subnet: 10.10.10.0/24 diff --git a/web_db/flask/app/__init__.py b/web_db/flask/app/__init__.py index 7ee9a50..e845a20 100644 --- a/web_db/flask/app/__init__.py +++ b/web_db/flask/app/__init__.py @@ -7,7 +7,7 @@ from werkzeug.utils import secure_filename from sqlalchemy import and_ import mysql.connector -UPLOAD_FOLDER = '/Users/patrickjmcd/Henry_Pump/tagserver/web_db/flask/app/docs' +UPLOAD_FOLDER = '/root/tag-server/flask/app/docs' ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif']) app = Flask('app', static_url_path='')