X-dark/django-ex
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
179 commits 1 branch 0 tags 352 KiB
Commit graph

179 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Parees
856f5572cf Merge pull request #78 from ghyde/fix-service-names 
Allow database service names to contain dashes.
 2017-02-02 11:41:37 -05:00
Garrett Hyde
870c64db0b Allow database service names to contain dashes. 
Fixes #77
 2017-02-02 01:10:49 -08:00
Ben Parees
31f1455e3b Merge pull request #76 from coreydaley/update_templates_to_use_secrets_2 
updating db dc
 2017-01-18 14:07:37 -05:00
Corey Daley
5620f6c47d
updating db dc 2017-01-18 13:47:08 -05:00
Ben Parees
5f5f5135e5 Merge pull request #75 from coreydaley/update_templates_to_use_secrets 
updating to use secrets
 2017-01-18 12:40:16 -05:00
Corey Daley
02b0ec0429
updating to use secrets 2017-01-18 12:37:38 -05:00
Ben Parees
6ddac81c67 Merge pull request #74 from bparees/template 
fix invalid key names
 2017-01-17 14:06:18 -05:00
Ben Parees
2b44398b0b fix invalid key names 2017-01-17 14:03:48 -05:00
Ben Parees
175b94b4da Merge pull request #73 from bparees/wsgi 
switch wsgi_application value to wsgi.application
 2017-01-03 12:42:12 -05:00
Ben Parees
6c4846b113 switch wsgi_application value to wsgi.application 2017-01-03 12:10:10 -05:00
Ben Parees
9f04dc0f07 Merge pull request #69 from guangxuli/fix_branch 
fix some incorrect description
 2016-12-11 23:05:22 -05:00
guangxuli
86f28a62ae fix some incorrect description 2016-12-12 10:00:14 +08:00
Ben Parees
b7ce642586 Merge pull request #68 from coreydaley/github_12043_origin_image_test_failure 
moving wsgi file and updating settings.py to work with updates to s2i-python-container changes
 2016-12-02 11:04:17 -05:00
Corey Daley
43bd6dcc57
moving wsgi file and updating settings.py to work with updates to s2i-python-container changes 2016-12-02 10:28:48 -05:00
Ben Parees
253aa3570f Merge pull request #67 from jupierce/migrate-passwords-to-secrets 
Moving credentials into secrets
 2016-11-29 14:26:21 -05:00
jupierce
2269d05536 Moving credentials into secrets 2016-11-29 11:18:03 -05:00
Ben Parees
c4727a081b Merge pull request #66 from bparees/allowed_hosts 
move allowed hosts to settings.py
 2016-11-02 15:35:32 -04:00
Ben Parees
4170089b8e move allowed hosts to settings.py 2016-11-02 15:29:14 -04:00
Ben Parees
28ce74503e Merge pull request #65 from bparees/allowed_hosts 
add allowed_hosts env var for django
 2016-11-02 14:18:52 -04:00
Ben Parees
080ea9203d add allowed_hosts env var for django 2016-11-02 14:18:17 -04:00
Ben Parees
c28ec1e65e Merge pull request #64 from luciddreamz/master 
Updates template display name, tags, description, message, and grouping
 2016-10-24 16:51:38 -04:00
luciddreamz
6b3770e705 Updates template display name, tags, description, message, and service grouping 2016-10-24 16:33:48 -04:00
Ben Parees
380f34793e Merge pull request #63 from sallyom/group-services 
group services in quickstarts
 2016-10-19 13:53:28 -04:00
Sally O'Malley
d0e5792db2 group services in quickstarts 2016-10-19 13:30:27 -04:00
Ben Parees
9f38043a5e Merge pull request #61 from stedotmartin/master 
Updated django-debug-toolbar to 1.5 to fix
 2016-10-02 06:00:08 -08:00
Stephen Martin
734d72755f Updated django-debug-toolbar to 1.5 to fix 
TypeError at /
process() missing 1 required positional argument: 'stream'

Related to https://github.com/jazzband/django-debug-toolbar/issues/856
 2016-10-02 10:00:29 +01:00
Ben Parees
b0d550d173 Merge pull request #59 from luciddreamz/master 
Adds Django/PostgreSQL template with persistent storage.
 2016-09-20 09:12:19 -04:00
luciddreamz
de05f62676 Adds Django/PostgreSQL template with persistent storage. 2016-09-13 09:44:51 -04:00
Ben Parees
fa3c4f3399 Merge pull request #55 from bparees/bump_version 
bump to latest imagestream versions
 2016-07-13 13:38:56 -04:00
Ben Parees
bb07bf1b49 bump to latest imagestream versions 2016-07-13 13:26:20 -04:00
Rodolfo Carvalho
8a0c7d6a9b Merge pull request #53 from jfmatth/whitenoise-compression 
enable whitenoise compression #3
 2016-07-08 17:43:50 +02:00
John Matthew
7c7c236824 enable compression 2016-07-08 08:00:57 -07:00
Rodolfo Carvalho
6aa44a62c5 Merge pull request #50 from jfmatth/add-whitenoise 
Put Whitenoise back in settings.py
 2016-07-08 08:26:54 +02:00
John Matthew
47671cfcf7 update to remove old whitenoise setup 2016-07-07 21:47:39 -07:00
John Matthew
22b1bdf656 remove extra line 2016-07-07 07:04:00 -07:00
Ben Parees
6e6a53ec04 Merge pull request #51 from dinhxuanvu/template-fix 
Add PIP_INDEX_URL option and fix required parameter issue
 2016-07-06 12:13:49 -04:00
Vu Dinh
472ea2f68f Add PIP_INDEX_URL option and fix required parameter issue 
The new PIP_INDEX_URL parameter is added to allow custom PyPi mirror
URL to be used during the build process.

There are several paramaters that are required but didn't listed as
requested (*). Now, they are marked as required to be explicit.

Signed-off-by: Vu Dinh <vdinh@redhat.com>
 2016-07-06 11:57:04 -04:00
John Matthew
a33bd309a6 Put Whitenoise back in settings.py 2016-07-05 07:34:04 -07:00
Ben Parees
70d28615a8 Merge pull request #47 from dinhxuanvu/django-version 
Fix Django version incompatible for Python 3.3
 2016-06-27 10:34:32 -04:00
Ben Parees
c57ca429be Merge pull request #46 from bkmagnetron/master 
docs: update python 33 to python 35
 2016-06-22 05:51:16 -07:00
Balakrishnan
3cf1378da5 Fix ImportError: cannot import name find_spec 
find_spec isn't available in Python 3.3; it was added in Python 3.4.
 2016-06-22 03:50:58 -04:00
Vu Dinh
dc5fa090df Fix Django version incompatable for Python 3.3 
The current required Django version is 1.9.5 which doesn't support
Python 3.3 which causes the Python 3.3 deployment to fail while
using django-ex git repo.

The Django version is modified to use 1.8.x only to include Python
3.3 support.

Signed-off-by: Vu Dinh <vdinh@redhat.com>
 2016-06-13 12:45:42 -04:00
Ben Parees
be20c410d9 fix django typo 2016-06-09 08:59:13 -04:00
Ben Parees
c3ebdac547 Merge pull request #45 from gabemontero/fixWebhookInstructions 
update webhook instructions
 2016-05-22 20:10:40 -04:00
gabemontero
e321b6dce4 update webhook instructions 2016-05-22 20:00:52 -04:00
Ben Parees
4e6e4bac6f Merge pull request #44 from gabemontero/fixContainerImageField 
fix container image field - get as close to no value as currently pos…
 2016-05-16 12:06:37 -04:00
gabemontero
067d9b0bad fix container image field - get as close to no value as currently possible 2016-05-16 12:00:15 -04:00
Ben Parees
77f7d4bec3 Merge pull request #43 from gabemontero/fixTemplatesVolLab 
add volume labels from origin version
 2016-05-12 13:19:55 -04:00
gabemontero
7d797d8b70 add volume labels from origin version 2016-05-12 12:59:41 -04:00
Ben Parees
26d90aed54 Merge pull request #42 from gabemontero/fixTemplatesAutoFalse 
change BC ICT to automatic=true (more deterministic)
 2016-05-12 10:28:33 -04:00