From 09398b2ab080995047a77bf34ae53fa08ac07392 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Fri, 6 Jan 2017 17:04:57 -0500
Subject: [PATCH] Changing to Ubuntu and docker-compose v2. Closes #185

---
 Dockerfile         | 11 +++++++----
 docker-compose.yml | 45 ++++++++++++++++++++-------------------------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6bfffa9e..757ba10e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,11 @@
-FROM alpine:3.2
-RUN apk update && apk upgrade
-RUN apk add git gcc musl-dev libffi-dev python python-dev py-pip
+FROM ubuntu:latest
+RUN apt-get update -y
+RUN apt-get upgrade -y
+RUN apt-get install build-essential python-dev python-pip libffi-dev -y
 
-RUN mkdir /opt
+VOLUME ["/opt/CTFd"]
+
+RUN mkdir -p /opt/CTFd
 COPY . /opt/CTFd
 WORKDIR /opt/CTFd
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 906018f5..563ddfc9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,26 +1,21 @@
-ctfd:
-  build: .
-  restart: always 
-  ports:
-    - "8000:8000" 
-  environment: 
-    - DATABASE_URL=mysql+pymysql://root@db/ctfd
-  volumes_from:
-    - data:rw
-  links:
-    - db:db
+version: '2'
 
-db:
-  image: mysql
-  environment:
-    - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-  volumes_from:
-    - data:rw
-  
-data:
-  image: mysql
-  restart: always
-  volumes:
-    - /var/lib/mysql
-    - /opt/CTFd/CTFd/logs
-  command: "tail -f /dev/null"
+services:
+  ctfd:
+    build: .
+    restart: always
+    ports:
+      - "8000:8000"
+    environment:
+      - DATABASE_URL=mysql+pymysql://root@db/ctfd
+    volumes:
+      - .data/CTFd/logs:/opt/CTFd/CTFd/logs
+    links:
+      - db:db
+
+  db:
+    image: mysql
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+    volumes:
+      - .data/mysql:/var/lib/mysql