470 Commits

Author SHA1 Message Date
Frank Hamand
0835c6d7f1 Update CHANGES 2017-02-18 09:49:49 +00:00
Frank Hamand
3ec0545e93 Add missing theme fonts 2017-02-17 15:02:00 +00:00
Frank Hamand
d0ff9bda11 Update CHANGES 2017-02-17 14:48:23 +00:00
Frank Hamand
df3e799cbc Add static files and templates to MANIFEST.in 2017-02-17 14:47:56 +00:00
Frank Hamand
764a93e4ca Merge pull request #431 from arachnys/whitenoise
Add whitenoise for serving static files
2017-02-17 14:46:26 +00:00
Frank Hamand
1f0f1ed664 Update CHANGES 2017-02-17 14:32:02 +00:00
Frank Hamand
831fd638d7 Add whitenoise for serving static files 2017-02-17 12:12:50 +00:00
Frank Hamand
e1a64e52ef 0.8.3 0.8.3 2017-02-16 18:51:22 +00:00
Frank Hamand
30c5a6f44f Default LOG_FILE to /dev/null
Makes it so you don't need settings to run e.g. collectstatic
2017-02-16 18:50:28 +00:00
Frank Hamand
76607c748b Fix missing template context processors
App is broken with error:

ImproperlyConfigured: Enable 'django.contrib.auth.context_processors.auth' in your TEMPLATES setting in order to use the admin application.
2017-02-16 18:37:15 +00:00
Frank Hamand
7765de28f4 Merge pull request #429 from PhilippeDupont/patch-1
Expose port 5001 for web container
2017-02-16 16:15:36 +00:00
Frank Hamand
0e520ee21f Add temporary 'sut' service to docker-compose-test
This is a work around to fix docker hub's automated tests failing.
Really we should just disable the test on docker hub but I don't have
access
2017-02-16 16:09:54 +00:00
Philippe Dupont
06a32cda50 Expose port 5001 for web container
The server is run at port 5001, the container should expose this port and not 5000
2017-02-16 17:00:00 +01:00
Frank Hamand
9aba84cc77 Use travis's default docker-compose version
I don't see why we need to specifically use 1.8
2017-02-16 15:48:40 +00:00
Frank Hamand
65b62fb815 Use logging.NullHandler instead of deprecated django version 2017-02-16 15:08:55 +00:00
Frank Hamand
1f8cd60a40 Update django_coverage_plugin
It was complaining about TEMPLATE_DEBUG not being set, even though
TEMPLATE_DEBUG now defaults to DEBUG. Newer versions of coverage plugin
work properly
2017-02-16 15:07:48 +00:00
Frank Hamand
13fbec536f 0.8.2 0.8.2 2017-02-16 14:59:54 +00:00
Frank Hamand
3ca41fd16c Update CHANGES 2017-02-16 14:54:57 +00:00
Frank Hamand
906987237e Merge pull request #427 from jezdez/bug426
Drop using django-smtp-ssl and a few minor settings updates
2017-02-16 14:54:25 +00:00
Frank Hamand
a6a84be24e Merge branch 'master' into bug426 2017-02-16 14:46:25 +00:00
Frank Hamand
20ea33f042 Merge pull request #428 from arachnys/fix-all-warnings
Fix all django warnings
2017-02-16 14:42:36 +00:00
Frank Hamand
1161d5df01 Re-add sqlalchemy requirement - it's still used for test result backend 2017-02-16 14:40:02 +00:00
Frank Hamand
2806128a19 Refactor clean_db task and add check for infinite cleaning loop 2017-02-16 14:36:54 +00:00
Jannis Leidel
9ccc9175c9
Added missing default for environ_get_list 2017-02-16 13:59:08 +01:00
Jannis Leidel
5c9de8236e
Minor cosmetic change in settings. 2017-02-16 13:59:08 +01:00
Jannis Leidel
326cf5d548
Support CACHE_URL for the Celery broker as well. 2017-02-16 13:59:08 +01:00
Jannis Leidel
a961f9621e
Drop django-smtp-ssl in favor of Django's native feature 2017-02-16 13:59:01 +01:00
Frank Hamand
30df15d19a Add another cleanup test and fix celery test broker
Turns out celery doesn't like in-memory sql backends, but has a
built-in memory broker. Use that instead and remove sqlalchemy
requirement
2017-02-16 12:56:20 +00:00
Frank Hamand
9f61f9e621 Fix all django warnings
Mainly involved updating django-compressor and related changes
2017-02-16 12:43:38 +00:00
Frank Hamand
9388274b84 Merge pull request #423 from arachnys/alpine-docker
Switch to using alpine linux for docker container
2017-02-16 12:42:23 +00:00
Frank Hamand
86b41dcfd1 Add comment for wait_for_migrations hack 2017-02-16 12:00:17 +00:00
Frank Hamand
f59d02926a Move sqlalchemy to requirements-dev.txt
It's only used for tests (to use sqlite as celery queue)
2017-02-16 11:58:11 +00:00
Frank Hamand
da2cbe85c0 Remove docker-compose-production.yml
I think this should be moved to a separate repository
2017-02-13 14:48:07 +00:00
Frank Hamand
06716e9837 Update travis.yml to use docker-compose-test.yml 2017-02-13 14:48:07 +00:00
Frank Hamand
fd5f0d6b48 Update CHANGES 2017-02-13 14:48:07 +00:00
Frank Hamand
bc1b8b79d7 Fix db cleanup test
The test wasn't running with CELERY_ALWAYS_EAGER so the clean task
wasn't re-running itself to cleanup the other result
2017-02-13 14:48:07 +00:00
Frank Hamand
ec5f6825e2 Add default.env and test.env and multiple docker-compose files to override settings 2017-02-13 14:48:07 +00:00
Frank Hamand
2f79bc5a23 Switch to using alpine linux for docker container 2017-02-13 14:08:24 +00:00
Frank Hamand
5c43b2a744 Merge pull request #424 from arachnys/fix-database-cleanup-task
Fix database cleanup task
2017-02-13 14:07:04 +00:00
Frank Hamand
6c0c5d0577 Update CHANGES 2017-02-13 14:01:23 +00:00
Frank Hamand
1dae33d665 Refactor clean db task 2017-02-13 13:52:12 +00:00
Frank Hamand
4a3d2155fe Add tests 2017-02-12 12:05:00 +00:00
Frank Hamand
3992f9e863 Fix database cleanup task
The task was failing for 2 reasons:

1. It was selecting ALL results, flattening them into a list and only
then truncating to 100. The table has 46 million rows. Fix this by
truncating in the database before flattening to a list.

2. The sql query was very expensive, this is because it was filtering
by *time*, but sorting on *time_complete* (the default ordering)
2017-02-12 11:27:51 +00:00
Frank Hamand
25adc5d9c4 Merge pull request #421 from arachnys/auto-initialise-docker
Auto initialise on docker container start
2017-02-09 18:32:27 +00:00
Frank Hamand
97de1820dd Update CHANGES 2017-02-09 17:58:24 +00:00
Frank Hamand
6ac8eb10ad Silence output from container waits and add timeout 2017-02-09 17:58:06 +00:00
Frank Hamand
3a5e524b04 Automatically initialise database and assets on docker start
Currently the first time you run the server you need to manually
syncdb, create superuser and collect assets. Do this automatically
on container launch
2017-02-09 17:58:06 +00:00
Frank Hamand
1f2f23e8f6 Merge pull request #422 from arachnys/update-plugin-conf
Update CABOT_PLUGINS_ENABLED versions
2017-02-09 17:57:10 +00:00
Frank Hamand
7bec7393d4 Update CABOT_PLUGINS_ENABLED versions 2017-02-09 17:50:00 +00:00
Frank Hamand
e5ecbe10da Merge pull request #420 from arachnys/fix-database-race-condition
Fix docker container race conditions
2017-02-09 16:21:49 +00:00