From f1bf2fd4e570dc7af06b9624c0ba09b6d4f5e292 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Thu, 10 Nov 2016 15:35:59 -0500
Subject: [PATCH] Streamlining docker-compose process

---
 docker-compose-run.sh | 17 -----------------
 docker-compose.yml    | 20 ++++++++------------
 2 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100755 docker-compose-run.sh

diff --git a/docker-compose-run.sh b/docker-compose-run.sh
deleted file mode 100755
index e1d03293..00000000
--- a/docker-compose-run.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-sed "s;sqlite:///ctfd.db;mysql+pymysql://${MYSQL_USER}:${MYSQL_PASSWORD}@db/ctfd;g" CTFd/config.py -i
-
-# wait for mysql to start
-cnt=0
-while ! nc db 3306 >/dev/null 2>&1 < /dev/null; do
-    if [ $cnt -ge 50 ]; then
-      echo "$(date) - db:3306 still not reachable, giving up"
-      exit 1
-    fi
-    echo "$(date) - waiting for db:3306..."
-    sleep 1
-    cnt=`expr $cnt + 1`
-done
-
-gunicorn --bind 0.0.0.0:8000 -w 4 "CTFd:create_app()"
diff --git a/docker-compose.yml b/docker-compose.yml
index bfc73b3c..906018f5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,28 +1,24 @@
 ctfd:
   build: .
-  restart: always  
+  restart: always 
+  ports:
+    - "8000:8000" 
   environment: 
-    - &MU MYSQL_USER=ctfd
-    - &MP MYSQL_PASSWORD=You_Should_Probably_Override_This
-    - &MD MYSQL_DATABASE=ctfd
-  command: sh docker-compose-run.sh
+    - DATABASE_URL=mysql+pymysql://root@db/ctfd
   volumes_from:
     - data:rw
   links:
-    - db
+    - db:db
 
 db:
-  image: mariadb
+  image: mysql
   environment:
-    - *MU
-    - *MP
-    - *MD
-    - MYSQL_ROOT_PASSWORD=Unencrypted_Credentials_At_Rest
+    - MYSQL_ALLOW_EMPTY_PASSWORD=yes
   volumes_from:
     - data:rw
   
 data:
-  image: mariadb
+  image: mysql
   restart: always
   volumes:
     - /var/lib/mysql