diff --git a/www/Dockerfile b/www/Dockerfile index 289e167a7886fc40c99e512197864e5f08d324e2..24d6db8d712059129ef5f34cff5c09f0cf673259 100644 --- a/www/Dockerfile +++ b/www/Dockerfile @@ -2,29 +2,30 @@ From debian:jessie # Common Packages RUN apt-get update && apt-get install -y \ - debconf-utils apt-utils rsyslog less nano \ - ldap-utils \ - build-essential \ - libfreetype6-dev \ - libjpeg-dev \ - libsasl2-dev \ - libldap2-dev \ - libssl-dev \ + debconf-utils apt-utils rsyslog less nano \ + ldap-utils \ + build-essential \ + libfreetype6-dev \ + libjpeg-dev \ + libsasl2-dev \ + libldap2-dev \ + libssl-dev \ gettext \ git \ - nginx - + nginx \ + libmysqlclient-dev + # Python Packages RUN apt-get update && apt-get install -y \ python3 \ python3-pip \ python3-dev \ - python3-bootstrapform + python3-bootstrapform RUN pip3 install --upgrade pip RUN pip3 install \ - django==1.9 \ + django==1.10 \ django-ldapdb \ django-auth-ldap \ reportlab \ @@ -34,6 +35,8 @@ RUN pip3 install \ django-two-factor-auth \ matterhook \ markdown \ + django-mysql \ + mysqlclient \ --upgrade RUN pip3 install git+https://github.com/nkunihiko/django-bootstrap3-datetimepicker.git @@ -43,7 +46,7 @@ RUN rm /etc/nginx/sites-enabled/default RUN mkdir /opt/socket/ -COPY misc/ldapdb_base.py /usr/local/lib/python3.4/dist-packages/ldapdb/backends/ldap/base.py +#COPY misc/ldapdb_base.py /usr/local/lib/python3.4/dist-packages/ldapdb/backends/ldap/base.py COPY misc/entrypoint.sh /opt/entrypoint.sh COPY misc/entrypoint_dev.sh /opt/entrypoint_dev.sh RUN chmod +x /opt/entrypoint* @@ -51,11 +54,6 @@ RUN chmod +x /opt/entrypoint* ADD web /opt/warpinfra/ ADD nginx /opt/nginx -RUN apt-get update && apt-get install -y libmysqlclient-dev -RUN pip3 install django-mysql mysqlclient - - - EXPOSE 8000 443 80 VOLUME ["/opt/nginx", "/opt/warpinfra"] diff --git a/www/web/warpzone/urls.py b/www/web/warpzone/urls.py index 6ba2de8562168230a7fbefb22c10b519c728c270..b8d82b42f4c834fe4177b090a8b8dbd3bcced2fd 100644 --- a/www/web/warpzone/urls.py +++ b/www/web/warpzone/urls.py @@ -5,7 +5,8 @@ from django.conf import settings urlpatterns = [ url(r'^admin/', include(admin.site.urls)), - url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, }), + + url(r'^media/(?P<path>.*)$', django.views.static.serve, {'document_root': settings.MEDIA_ROOT, }), ] if "warpmain" in settings.INSTALLED_APPS: