Skip to content

Commit 70ce135

Browse files
committed
Graphite 1.1.2, Django 1.11.10, phusion baseimage 0.10.0
1 parent c5545d1 commit 70ce135

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM phusion/baseimage:0.9.22
1+
FROM phusion/baseimage:0.10.0
22
MAINTAINER Denys Zhdanov <denis.zhdanov@gmail.com>
33

44
RUN apt-get -y update \
@@ -34,9 +34,9 @@ RUN if [ ! -z "${CONTAINER_TIMEZONE}" ]; \
3434

3535
# fix python dependencies (LTS Django)
3636
RUN pip install --upgrade pip && \
37-
pip install django==1.8.18
37+
pip install django==1.11.10
3838

39-
ARG version=1.1.1
39+
ARG version=1.1.2
4040
ARG whisper_version=${version}
4141
ARG carbon_version=${version}
4242
ARG graphite_version=${version}

conf/usr/local/bin/django_admin_init.exp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
set timeout -1
44
spawn /usr/local/bin/manage.sh
55

6-
expect "Would you like to create one now" {
7-
send "yes\r"
8-
}
6+
#expect "Would you like to create one now" {
7+
# send "yes\r"
8+
#}
99

10-
expect "Username" {
10+
expect "Username (leave blank to use 'root'):" {
1111
send "root\r"
1212
}
1313

conf/usr/local/bin/manage.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
#!/bin/bash
2-
PYTHONPATH=/opt/graphite/webapp django-admin.py syncdb --settings=graphite.settings
3-
# PYTHONPATH=/opt/graphite/webapp django-admin.py update_users --settings=graphite.settings
2+
# Django 1.11
3+
PYTHONPATH=/opt/graphite/webapp django-admin.py makemigrations --settings=graphite.settings
4+
PYTHONPATH=/opt/graphite/webapp django-admin.py migrate auth --settings=graphite.settings
5+
PYTHONPATH=/opt/graphite/webapp django-admin.py migrate --run-syncdb --settings=graphite.settings
6+
PYTHONPATH=/opt/graphite/webapp django-admin.py createsuperuser --settings=graphite.settings
7+
8+
# Django 1.8
9+
# PYTHONPATH=/opt/graphite/webapp django-admin.py syncdb --settings=graphite.settings
10+
# Django 1.6
11+
# PYTHONPATH=/opt/graphite/webapp django-admin.py update_users --settings=graphite.settings

0 commit comments

Comments
 (0)