Commit graph

209 commits

Author SHA1 Message Date
Ben Parees
d588e14490
Merge pull request #113 from jim-minter/issue16726
remove expose annotations from quickstarts and add bindable: false
2017-11-07 21:13:47 +01:00
Jim Minter
dd4a001c43 remove expose annotations from quickstarts and add bindable: false 2017-11-07 13:03:41 -06:00
Ben Parees
b75ed7533d Merge pull request #112 from tnir/111-new-logo
Use a new logo for template
2017-10-24 18:55:00 +02:00
Takuya Noguchi
6f9ebeb341 Use a new logo for template 2017-10-25 01:51:38 +09:00
Ben Parees
953d2aaf68 Merge pull request #110 from tnir/readme-copyedit
Fix typo in README
2017-10-24 18:29:56 +02:00
Takuya Noguchi
ad590c2302 Fix typo in README 2017-10-25 01:23:27 +09:00
Ben Parees
71027075d1 Merge pull request #109 from tnir/105-update-django-to-1.11
Update django to 1.11.x
2017-10-24 18:11:56 +02:00
Takuya Noguchi
638277ed07 Update django to 1.11.x 2017-10-25 00:44:37 +09:00
Takuya Noguchi
a6979d731a Update whitenoise to 3.3.1 2017-10-25 00:44:37 +09:00
Takuya Noguchi
fee846019b Update django-debug-toolbar to 1.8 2017-10-25 00:44:29 +09:00
Ben Parees
ad54b3b65e Merge pull request #104 from tnir/103-update-local-dev-on-macos
Update psycopg2 to 2.7.3.1
2017-10-24 16:55:42 +02:00
Takuya Noguchi
08ae75e7e6 Update psycopg2 to 2.7.3.1 2017-10-24 23:20:36 +09:00
Ben Parees
2e6b11f42f Merge pull request #99 from bparees/annotations
remove template prefix from tsb annotations
2017-10-19 14:56:13 +02:00
Ben Parees
716852864f remove template prefix from tsb annotations 2017-10-19 14:52:50 +02:00
Ben Parees
30ec0ddd17 Merge pull request #97 from jim-minter/wait-completion-fixups
add missing template.alpha.openshift.io/wait-for-ready annotations to examples
2017-08-18 13:22:27 -04:00
Jim Minter
e4617aff15 add missing template.alpha.openshift.io/wait-for-ready annotations to examples 2017-08-18 12:15:45 -05:00
Ben Parees
19fed1196b Merge pull request #96 from jim-minter/trello135-completion-detection
add template completion detection
2017-08-16 14:18:39 -04:00
Jim Minter
34d78b3487 add template completion detection 2017-08-14 12:04:37 -05:00
Ben Parees
b8484b98a5 Merge pull request #95 from shanemacbride/master
Add information for pg_config error #70 #94
2017-07-20 17:39:30 -04:00
shanemacbride
29976eaa12 Add information for pg_config error #70 #94 2017-07-20 14:33:06 -07:00
Ben Parees
82a41db70f Merge pull request #93 from coreydaley/bugzilla_1365656_github_webhook_description_update
Updating GITHUB_WEBHOOK_SECRET description
2017-06-25 23:27:53 -04:00
Corey Daley
a3ad571cd4
Updating GITHUB_WEBHOOK_SECRET description 2017-06-25 23:05:35 -04:00
Ben Parees
8a4ce9e1a3 Merge pull request #89 from jim-minter/trello133-tsb-bind
update templates to use template.openshift.io/expose-uri
2017-06-13 12:24:16 -04:00
Jim Minter
7c497532b2 update templates to use template.openshift.io/expose-uri 2017-06-13 17:20:55 +01:00
Ben Parees
cedcc6889d Merge pull request #84 from dinhxuanvu/recreate
Change DC strategy from Rolling to Recreate for DB templates
2017-04-25 16:53:59 -04:00
Vu Dinh
113d6d01fe Change DC strategy from Rolling to Recreate for DB templates
Recreate strategy will allow the redeployment process to stay within
1Gi memory limit instead of requiring more memory due to extra pod
is created for Rolling strategy.

Signed-off-by: Vu Dinh <vdinh@redhat.com>
2017-04-25 16:52:07 -04:00
Ben Parees
ce8bc24339 Merge pull request #83 from coreydaley/github_58_notes_in_docs_about_tests
Warn about database and tests
2017-03-29 11:34:38 -04:00
Corey Daley
0758c6baef
Warn about database and tests 2017-03-29 11:23:01 -04:00
Ben Parees
8c20b559cd Merge pull request #80 from bparees/sc_metadata
add service catalog metadata to templates
2017-02-15 16:27:37 -05:00
Ben Parees
1a0b2abcf8 add service catalog metadata to templates 2017-02-15 16:26:11 -05:00
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