archive/django-gallery
1
0
Fork 0
mirror of https://github.com/c0de-archive/django-gallery.git synced 2024-12-22 18:22:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into account

Browse Source
This commit is contained in:
David Todd 2018-03-08 22:55:26 -06:00 committed by GitHub
commit b6074eb764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -6,7 +6,6 @@ ADD . /src
RUN set -ex \ RUN set -ex \
&& curl -L https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -o /usr/local/bin/wait-for-it.sh \ && curl -L https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -o /usr/local/bin/wait-for-it.sh \
&& chmod +x /usr/local/bin/wait-for-it.sh \ && chmod +x /usr/local/bin/wait-for-it.sh \
&& pip install -r requirements.txt \ && pip install -r requirements.txt
&& python manage.py collectstatic --noinput
CMD python manage.py runserver 0.0.0.0:8000 CMD python manage.py runserver 0.0.0.0:8000

4
gallery/settings.py
View File

@ -28,6 +28,9 @@ ALLOWED_HOSTS = ['*']
if DEBUG: if DEBUG:
INTERNAL_IPS = ('localhost',) INTERNAL_IPS = ('localhost',)
DEBUG_TOOLBAR_CONFIG = {
'SHOW_TOOLBAR_CALLBACK': (lambda x: True),
}
# SMTP server/relay to send error emails (to ADMINS) from # SMTP server/relay to send error emails (to ADMINS) from
ADMINS = [('c0de', 'c0de@c0defox.es')] ADMINS = [('c0de', 'c0de@c0defox.es')]
@ -53,6 +56,7 @@ INSTALLED_APPS = [
] ]
if DEBUG: if DEBUG:
INSTALLED_APPS += [ INSTALLED_APPS += [
'debug_toolbar',
'debug_panel' 'debug_panel'
] ]

5
gallery/urls.py
View File

@ -15,8 +15,13 @@ Including another URLconf
""" """
from django.conf.urls import include, url from django.conf.urls import include, url
from django.contrib import admin from django.contrib import admin
from django.conf import settings
urlpatterns = [ urlpatterns = [
url(r'^account/', include('account.urls')), url(r'^account/', include('account.urls')),
url(r'^admin/', admin.site.urls), url(r'^admin/', admin.site.urls),
] ]
if settings.DEBUG:
urlpatterns += [
url(r'^__debug__/', include(__import__('debug_toolbar').urls)),
]

1
requirements.txt
View File

@ -18,4 +18,3 @@ six==1.10.0
sqlparse==0.2.3 sqlparse==0.2.3
uWSGI==2.0.15 uWSGI==2.0.15
zipstream==1.1.4 zipstream==1.1.4
whitenoise==3.3.1