Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
b1fc5b17
Unverified
Commit
b1fc5b17
authored
Apr 26, 2017
by
Thom Wiggers
📐
Browse files
Improve testing the docker container
Have sendfile actually serve files if debug is on, and clean up the dockerfile
parent
07202744
Changes
2
Hide whitespace changes
Inline
Side-by-side
docker-compose.yml
View file @
b1fc5b17
...
...
@@ -16,14 +16,11 @@ services:
-
postgres
volumes
:
-
./website:/usr/src/app
-
/concrexit/
-
concrexit:
/concrexit/
environment
:
<<
:
*postgresvars
DJANGO_DEBUG
:
'
True'
DJANGO_POSTGRES_HOST
:
postgres
MIGRATION_KEY
:
${CONCREXIT_MIGRATION_KEY}
volumes
:
concrexit-media
:
driver
:
local
concrexit-static
:
concrexit
:
driver
:
local
website/thaliawebsite/settings/production.py
View file @
b1fc5b17
...
...
@@ -58,7 +58,8 @@ CONN_MAX_AGE = '60'
MEDIA_ROOT
=
'/concrexit/media'
MEDIA_URL
=
'/media/'
# Public is included by the db fields
SENDFILE_BACKEND
=
'sendfile.backends.nginx'
if
not
settings
.
DEBUG
:
SENDFILE_BACKEND
=
'sendfile.backends.nginx'
SENDFILE_URL
=
'/media/'
SENDFILE_ROOT
=
'/concrexit/media/'
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment