Merge pull request #27 from graphite-project/DZ-0.10-1.1.2

Graphite 1.1.2, Django 1.11.10, phusion baseimage 0.10.0

Author: deniszh

Dockerfile

@@ -1,4 +1,4 @@
-FROM phusion/baseimage:0.9.22
+FROM phusion/baseimage:0.10.0
 MAINTAINER Denys Zhdanov <denis.zhdanov@gmail.com>
 
 RUN apt-get -y update \
@@ -34,9 +34,9 @@ RUN if [ ! -z "${CONTAINER_TIMEZONE}" ]; \
 
 # fix python dependencies (LTS Django)
 RUN pip install --upgrade pip && \
-  pip install django==1.8.18
+  pip install django==1.11.10
 
-ARG version=1.1.1
+ARG version=1.1.2
 ARG whisper_version=${version}
 ARG carbon_version=${version}
 ARG graphite_version=${version}

conf/usr/local/bin/django_admin_init.exp

@@ -3,11 +3,11 @@
 set timeout -1
 spawn /usr/local/bin/manage.sh
 
-expect "Would you like to create one now" {
-  send "yes\r"
-}
+#expect "Would you like to create one now" {
+#  send "yes\r"
+#}
 
-expect "Username" {
+expect "Username (leave blank to use 'root'):" {
   send "root\r"
 }
 

conf/usr/local/bin/manage.sh

@@ -1,3 +1,11 @@
 #!/bin/bash
-PYTHONPATH=/opt/graphite/webapp django-admin.py syncdb --settings=graphite.settings
-# PYTHONPATH=/opt/graphite/webapp django-admin.py update_users --settings=graphite.settings
+# Django 1.11
+PYTHONPATH=/opt/graphite/webapp django-admin.py makemigrations --settings=graphite.settings
+PYTHONPATH=/opt/graphite/webapp django-admin.py migrate auth --settings=graphite.settings
+PYTHONPATH=/opt/graphite/webapp django-admin.py migrate --run-syncdb --settings=graphite.settings
+PYTHONPATH=/opt/graphite/webapp django-admin.py createsuperuser --settings=graphite.settings
+
+# Django 1.8
+# PYTHONPATH=/opt/graphite/webapp django-admin.py syncdb --settings=graphite.settings
+# Django 1.6
+# PYTHONPATH=/opt/graphite/webapp django-admin.py update_users --settings=graphite.settings