From a750056aeb8d06f3aea6bfeb5bfc99f150ad6e18 Mon Sep 17 00:00:00 2001
From: osmala <ossi.laine@utu.fi>
Date: Tue, 8 Jun 2021 14:09:18 +0300
Subject: [PATCH] Fix connection issues in dockerized environment
---
Dockerfile | 4 ++++
app/embody_plot.py | 4 +++-
config.py | 3 +--
deploy/.env.dev | 1 -
deploy/docker-compose.yml | 2 --
requirements.txt | 3 ++-
6 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 238646d..bdc1b8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,3 +23,7 @@ COPY messages.pot /srv/app
RUN mkdir logs
+RUN mkdir app/static/embody_drawings
+RUN mkdir app/static/embody_images
+RUN mkdir app/static/experiment_stimuli
+
diff --git a/app/embody_plot.py b/app/embody_plot.py
index da51ab8..e599934 100644
--- a/app/embody_plot.py
+++ b/app/embody_plot.py
@@ -55,7 +55,9 @@ class MyDB(object):
self._db_connection = mariadb.connect(
user=Config.MYSQL_USER,
password=Config.MYSQL_PASSWORD,
- database=Config.MYSQL_DB
+ database=Config.MYSQL_DB,
+ host=Config.MYSQL_SERVER,
+ auth_plugin='mysql_native_password'
)
self._db_cur = self._db_connection.cursor()
diff --git a/config.py b/config.py
index 5e2e907..db3c14e 100644
--- a/config.py
+++ b/config.py
@@ -11,8 +11,7 @@ class Config(object):
MYSQL_SERVER = config('MYSQL_SERVER')
MYSQL_DB = config('MYSQL_DB')
- SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://'+MYSQL_USER+':' + \
- MYSQL_PASSWORD+'@'+MYSQL_SERVER+'/'+MYSQL_DB+'?charset=utf8mb4'
+ SQLALCHEMY_DATABASE_URI = f"mysql+pymysql://{MYSQL_USER}:{MYSQL_PASSWORD}@{MYSQL_SERVER}/{MYSQL_DB}?charset=utf8mb4"
SQLALCHEMY_TRACK_MODIFICATIONS = False
diff --git a/deploy/.env.dev b/deploy/.env.dev
index 879ce82..b876201 100644
--- a/deploy/.env.dev
+++ b/deploy/.env.dev
@@ -2,4 +2,3 @@ MYSQL_USER=rating
MYSQL_PASSWORD=rating_passwd
MYSQL_SERVER=db
MYSQL_DB=rating_db
-
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index ae8488a..2de8a3e 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -26,8 +26,6 @@ services:
depends_on:
- db
command: sh -c "gunicorn run:app -b 0.0.0.0:8000 -k gevent --worker-connections=1000 --workers=1 --log-level debug -t 180"
- #volumes: FOR DEV
- #- ./application:/srv/app
db:
image: mysql
diff --git a/requirements.txt b/requirements.txt
index 59c0e41..6fd9c34 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,6 @@ gevent==1.4.0
greenlet==0.4.15
gunicorn==19.9.0
matplotlib==3.0.3
-mysql-connector==2.2.9
networkx==2.2
numpy==1.16.2
Pillow
@@ -32,3 +31,5 @@ Werkzeug==0.14.1
WTForms==2.2.1
WTForms-SQLAlchemy==0.1
cryptography
+
+mysql-connector-python
\ No newline at end of file
--
GitLab