From 736a0e1dc3fd232c436974afbd2c50f8fdc22484 Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Sat, 3 Jun 2017 16:28:02 -0400 Subject: [PATCH] Fixing some docker issues Closes #266 --- docker-compose.yml | 9 ++++++--- docker-entrypoint.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a2900cca..e97a791b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: ports: - "8000:8000" environment: - - DATABASE_URL=mysql+pymysql://root@db/ctfd + - DATABASE_URL=mysql+pymysql://ctfd:ctfd@db/ctfd volumes: - .data/CTFd/logs:/opt/CTFd/CTFd/logs - .data/CTFd/uploads:/opt/CTFd/CTFd/uploads @@ -15,8 +15,11 @@ services: - db db: - image: mysql + image: mariadb environment: - - MYSQL_ALLOW_EMPTY_PASSWORD=yes + - MYSQL_ROOT_PASSWORD=ctfd + - MYSQL_USER=ctfd + - MYSQL_PASSWORD=ctfd + - MYSQL_DATABASE=ctfd volumes: - .data/mysql:/var/lib/mysql diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 30e2c835..08ef040e 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -12,4 +12,4 @@ echo "Ready" sleep 1; echo "Starting CTFd" -gunicorn --bind 0.0.0.0:8000 -w 4 'CTFd:create_app()' --access-logfile '/opt/CTFd/CTFd/logs/access.log' --error-logfile '/opt/CTFd/CTFd/logs/error.log' \ No newline at end of file +gunicorn --bind 0.0.0.0:8000 -w 1 --threads 8 'CTFd:create_app()' --access-logfile '/opt/CTFd/CTFd/logs/access.log' --error-logfile '/opt/CTFd/CTFd/logs/error.log'