dockerised!

Dockerfile

@@ -3,5 +3,6 @@ ENV PYTHONUNBUFFERED 1
 RUN mkdir /code
 WORKDIR /code
 ADD requirements.txt /code/
+ADD requirements /code/requirements
 RUN pip install -r requirements.txt
 ADD . /code/

docker-compose.yml

 version: '3'
 
 services:
-  db:
-    image: mysql
-  web:
-    build: .
-    command: python3 manage.py runserver 0.0.0.0:8000
-    volumes:
-      - .:/code
-    ports:
-      - "8000:8000"
-    depends_on:
-      - db
+    db:
+        environment:
+            MYSQL_DATABASE: db
+            MYSQL_PASSWORD: password
+            MYSQL_ROOT_PASSWORD: password
+            MYSQL_USER: root
+        image: mysql:latest
+        ports:
+          - 3306:3306
+    web:
+        image: wugsy:latest
+        build: .
+        command: python3 src/manage.py runserver 0.0.0.0:8000
+        volumes:
+            - .:/code
+        ports:
+            - "8000:8000"
+        depends_on:
+            - db

requirements/base.txt

-Django>=1.11.3
+Django==1.11.3
 django-environ>=0.4.3
 django-braces>=1.11.0
 django-crispy-forms>=1.6.1
 django-admin-bootstrapped>=2.5.7
 django-authtools>=1.6.0
 easy-thumbnails>=2.4.1
+djangorestframework
 psycopg2
+mysqlclient

src/wugsy/decide.py

@@ -35,7 +35,8 @@ class DecideGame(object):
         return 0
 
     def _get_title(self):
-        return 'Prototype game {} for {}'.format(self._nonce, self.user.name)
+        username = getattr(self.user, 'name', 'anonymous user')
+        return 'Prototype game {} for {}'.format(self._nonce, username)
 
     def _get_opponent(self):
         return dict(id=78,

src/wugsy/settings/base.py

@@ -102,9 +102,10 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': 'mysql',
-        'USER': 'mysql',
+        'USER': 'root',
+        'PASSWORD': 'password',
         'HOST': 'db',
-        'PORT': 5432,
+        'PORT': 3306,
     }
 }
 

src/wugsy/urls.py

@@ -5,7 +5,7 @@ from django.conf.urls.static import static
 import profiles.urls
 import accounts.urls
 from . import views
-from game.views import GamePage, generate_data
+from game.views import GamePage, generate_data, game_result
 
 urlpatterns = [
     url(r'^$', views.HomePage.as_view(), name='home'),

start.sh

+#!/usr/bin/env bash
+
+# quick script to create and run docker image, with db migrations
+
+docker-compose build
+docker-compose up -d
+sleep 5
+docker exec -it wugsy_web_1 python3 src/manage.py makemigrations
+docker exec -it wugsy_web_1 python3 src/manage.py migrate
+echo "Ready! Navigate to http://localhost:8000"