408 Commits

Author	SHA1	Message	Date
Michael Hobbs	6d71c164f0	Merge pull request #1128 from progrium/1091_mh-switch-to-herokuish ... switching to herokuish. closes #1091	2015-08-24 12:11:05 -07:00
Jose Diaz-Gonzalez	3f43a64430	Merge pull request #1399 from basicer/fix-multi-receive-app ... Make dokku play nice when we have multiple receive-app hooks	2015-08-24 14:54:13 -04:00
Rob Blanckaert	98990b6885	Make dokku play nice when we have multiple receive-app hooks in various plugins.	2015-08-24 14:20:36 -04:00
Michael Hobbs	42905c345b	support comments in DOKKU_SCALE and print contents on deploy	2015-08-24 09:22:07 -07:00
Michael Hobbs	8edea8512d	use /bin/sh instead of /bin/bash in order to support dockerfile images that don't include bash. fixes #1364	2015-08-03 11:42:30 -07:00
Michael Hobbs	11e10fceef	only run domains and nginx config if we have a port and ip. fixes #1355	2015-07-30 14:29:36 -07:00
Alessio Treglia	78c0cdc12d	Log receive-branch pluginhook ... Such new pluginhook was introduced in dokku v0.3.22.	2015-07-30 15:37:47 +01:00
Michael Hobbs	d21caa4811	Merge branch 'master' into 1091_mh-switch-to-herokuish	2015-07-28 10:55:44 -07:00
Michael Hobbs	36d607a4f4	[ci skip] update docs	2015-07-28 09:36:42 -07:00
Michael Hobbs	b30db17def	use column to format help output	2015-07-28 09:31:56 -07:00
alexkruegger	9910fb03da	fix bug in nginx.conf.template getting from /app directory	2015-07-20 14:02:44 +03:00
Michael Hobbs	d2f2bc9ac1	update docs to reflect default checks. rename DOKKU_DEFAULT_WAIT to DOKKU_DEFAULT_CHECKS_WAIT. refs #1323	2015-07-17 07:25:35 -07:00
Matt Walker	d457ffe7ee	Spelling fix: 'comma seperated'=>'comma-separated'	2015-07-14 15:46:32 -07:00
Michael Hobbs	c7cb014580	convenience functions for app container state	2015-07-13 09:27:42 -07:00
Michael Hobbs	633c595311	use docker inspect instead of docker ps grep pattern. closes #1281	2015-07-13 09:09:38 -07:00
Kilian Ciuffolo	0424d5a744	fixes #1270 faulty default container check	2015-07-13 09:09:38 -07:00
Jose Diaz-Gonzalez	0a4c22dfea	Merge pull request #1278 from progrium/nginx-template-from-app ... Nginx template from app	2015-07-13 10:35:42 -04:00
Jose Diaz-Gonzalez	68b12ab46f	Merge pull request #1298 from SonicHedgehog/fix-check-root ... Fix check-deploy skipping the root path	2015-07-13 10:31:21 -04:00
Jose Diaz-Gonzalez	ca1b17ea8d	Use nginx.conf.template as the template name	2015-07-12 20:06:21 -04:00
Jose Diaz-Gonzalez	007946f52a	Use simplified method for retrieving a container id	2015-07-12 20:02:29 -04:00
Michael Hobbs	3e58824377	Merge branch 'master' into kilianc_hotfix-#1259	2015-07-12 16:27:10 -07:00
Michael Hobbs	ee4fca572e	mv dockerfile port logic to common function + tests. closes #1280	2015-07-12 15:57:12 -07:00
Jose Diaz-Gonzalez	43b179735b	Merge pull request #1261 from Flink/bypass-checks-on-demand ... Allows to skip checks (all or default)	2015-07-11 16:31:21 -04:00
Jose Diaz-Gonzalez	6895dd9936	Use get_container_ids method to retrieve container for nginx conf	2015-07-11 16:29:25 -04:00
Assaf Arkin	71b79da262	CHANGED extract nginx.conf.template from project	2015-07-11 15:05:06 -04:00
Jakob Krigovsky	5f03518ec8	Fix check-deploy skipping the root path ... The root path, `/`, was treated as an invalid URL because it didn’t contain any characters after the slash.	2015-07-11 13:46:17 +02:00
Michael Hobbs	4629a9909b	Merge pull request #1291 from progrium/1261_mh-config-args-refactor ... initial pass at config plugin arguments refactor	2015-07-10 07:55:18 -07:00
Michael Hobbs	fd187ec837	[ci skip] remove unnecessary comments and update docs	2015-07-09 13:22:12 -07:00
Michael Hobbs	eebcfd85ab	fix deprecated comments and include *-buildstep pluginhooks for point release	2015-07-09 13:15:57 -07:00
Jakob Krigovsky	a60dfd3b5e	Set X-Forwarded-Proto header if TLS is enabled when running checks	2015-07-09 22:03:29 +02:00
Michael Hobbs	ab2539e894	Merge branch 'master' into 1091_mh-switch-to-herokuish	2015-07-09 13:00:44 -07:00
Michael Hobbs	64d76724e5	fix typo. good thing we have a test suite. :P	2015-07-09 12:35:43 -07:00
Michael Hobbs	033a267573	fix urls command when NO_VHOST=1 + tests. fixes #1294	2015-07-09 12:12:58 -07:00
Michael Hobbs	710c6f4e88	don't run dokku again on --* args in config plugin	2015-07-07 12:31:57 -07:00
Michael Hobbs	a84397895a	initial pass at config plugin arguments refactor	2015-07-06 19:41:17 -07:00
Michael Hobbs	1668f3bbc6	rename *-herokuish pluginhooks to *-buildpack	2015-07-06 12:45:37 -07:00
Michael Hobbs	2e9bb4eed1	need to call /build for herokuish	2015-07-06 12:41:54 -07:00
Michael Hobbs	0840d8fd1f	initial pass at switching to herokuish. closes #1091	2015-07-06 12:41:54 -07:00
Kilian Ciuffolo	5f8b2d291c	fixes #1259 now ignores protocol of Dockerfile EXPOSE	2015-07-04 10:37:22 -07:00
Jose Diaz-Gonzalez	5aada53945	Merge pull request #1277 from progrium/gzip-templates ... Gzip templates	2015-07-03 18:23:50 -04:00
Jose Diaz-Gonzalez	35ff3fa5ca	Merge pull request #1149 from mlebkowski/feature/receive-branch ... pluginhook to receive branches different than master	2015-07-03 17:07:31 -04:00
Jose Diaz-Gonzalez	2d6054605e	Remove non-standard redirects	2015-07-03 16:41:17 -04:00
krishna rokhale	62d1d41bc5	removing new lines.	2015-07-03 16:40:23 -04:00
krishna rokhale	adfa13235d	added two more cases to SSL template and gzip as default in templates.	2015-07-03 16:40:23 -04:00
Michael Hobbs	0e53a76a1a	[ci skip] ensure we parse the correct section of the string. closes #1271	2015-07-03 07:47:30 -07:00
Alessio Treglia	0ed0201b90	Use d-neg condition to prevent unexpected failures	2015-07-01 19:48:09 +01:00
Alessio Treglia	89d1acaa38	Revert "Fix double negative statement" ... This reverts commit 54ed3c1f2b.	2015-07-01 19:47:38 +01:00
Alessio Treglia	54ed3c1f2b	Fix double negative statement ... This is mostly for consistency with its own install script.	2015-07-01 19:20:53 +01:00
Alessio Treglia	91c691a806	Create dokku's /var/log/dokku/ private namespace ... Rename dokku.log to events.log. Refresh tests accordingly.	2015-07-01 18:25:11 +01:00
Alessio Treglia	172e71cac6	Merge branch 'master' into pr-dokku-events	2015-07-01 17:50:09 +01:00