Commit Graph

  • 9fbe033fba Fix link to docs from README Vinod Kurup 2015-08-08 21:25:35 -04:00
  • 287da3fa47 Correctly elevating echo piping Samuel Marks 2015-08-06 14:54:54 +10:00
  • 123d75c13a From /dev/null to -qq, from --silent to -sL, and sudo Samuel Marks 2015-08-05 12:20:51 +10:00
  • 777a09847c Make bootstrap.sh safe from bad connection O'meid 2015-08-04 15:09:37 +10:00
  • 00d834bdc3 Merge pull request #1365 from progrium/1364_mh-sh-not-bash Jose Diaz-Gonzalez 2015-08-03 15:30:32 -04:00
  • 8edea8512d use /bin/sh instead of /bin/bash in order to support dockerfile images that don't include bash. fixes #1364 Michael Hobbs 2015-08-03 11:40:30 -07:00
  • 466df88660 Merge pull request #1358 from bkniffler/patch-1 Jose Diaz-Gonzalez 2015-08-01 22:02:01 -04:00
  • 9fb7c205df Move small memory instructions to advanced installation - installation.md bkniffler 2015-07-31 18:26:07 +02:00
  • fa36d38fb7 Small fix bkniffler 2015-07-31 18:19:56 +02:00
  • 3a0a873079 Move small memory instructions to advanced installation bkniffler 2015-07-31 18:18:37 +02:00
  • b371bca82e Merge pull request #1357 from progrium/1355_mh-deploy-no-webproc Jose Diaz-Gonzalez 2015-07-31 10:47:23 -04:00
  • 05b7a8ecbd Merge pull request #1359 from progrium/1258_mh-dokku-wait-to-retire-per-app Jose Diaz-Gonzalez 2015-07-31 10:31:51 -04:00
  • c02ba86c81 allow DOKKU_WAIT_TO_RETIRE to be defined per app. closes #1258 Michael Hobbs 2015-07-30 15:03:17 -07:00
  • 003ab07ff4 Adapt to other shell example script bkniffler 2015-07-30 23:57:52 +02:00
  • d66b4665d0 Little correction bkniffler 2015-07-30 23:53:01 +02:00
  • 07cb639bd5 Add suggestion for low memory VMs bkniffler 2015-07-30 23:38:27 +02:00
  • 11e10fceef only run domains and nginx config if we have a port and ip. fixes #1355 Michael Hobbs 2015-07-30 14:29:36 -07:00
  • c750f5a768 Allow stop/kill to continue in the event that it cannot stop or kill one of the old containers. Also actually attempt to kill if stop has a bad exit code. Trevor Joynson (trevorj) 2015-07-30 16:00:53 -04:00
  • b0d55ce589 Merge pull request #1354 from alessio/events-new-receive-branch-hook Michael Hobbs 2015-07-30 08:39:02 -07:00
  • 78c0cdc12d Log receive-branch pluginhook Alessio Treglia 2015-07-30 15:37:47 +01:00
  • c1a0e0ce68 Improve file searching and variable usage Adam Vigneaux 2015-07-28 18:48:31 -04:00
  • d21caa4811 Merge branch 'master' into 1091_mh-switch-to-herokuish Michael Hobbs 2015-07-28 10:55:44 -07:00
  • fd3f84669b Merge pull request #1292 from progrium/mh-columnar-help-output Michael Hobbs 2015-07-28 10:51:50 -07:00
  • 36d607a4f4 [ci skip] update docs Michael Hobbs 2015-07-07 16:33:13 -07:00
  • b30db17def use column to format help output Michael Hobbs 2015-07-07 09:41:18 -07:00
  • d05df06f1a Merge pull request #1349 from alexkruegger/master Michael Hobbs 2015-07-28 08:51:03 -07:00
  • 7e89932dba Update plugins.md alexkruegger 2015-07-28 18:48:00 +03:00
  • 7cd1b6cdc5 add plugin dokku-app-configfiles alexkruegger 2015-07-28 18:05:29 +03:00
  • 8df24ff4a6 Merge pull request #1346 from progrium/1220_mh-document-dokku-cleanup Jose Diaz-Gonzalez 2015-07-27 13:08:08 -04:00
  • 67ab803283 [ci skip] document dokku cleanup and the potential of compat issues. closes #1220 Michael Hobbs 2015-07-27 09:49:52 -07:00
  • e9efcbead4 Merge pull request #1321 from econya/master Jose Diaz-Gonzalez 2015-07-26 22:56:41 -04:00
  • dc5f34534b Improve formatting Adam Vigneaux 2015-07-26 22:37:56 -04:00
  • 14e72ea337 Add better error checking on nginx:import-ssl Adam Vigneaux 2015-07-26 22:21:32 -04:00
  • 3525f699f9 Merge pull request #1341 from progrium/1336_mh-use-dockerfile-port-sans-vhost Michael Hobbs 2015-07-24 12:45:15 -07:00
  • 9593bd6d48 simplify docker run logic in deploy Michael Hobbs 2015-07-24 12:15:10 -07:00
  • da5f42a13e set and use $port whenever $PROC_TYPE == 'web'. closes #1336 Michael Hobbs 2015-07-24 10:40:00 -07:00
  • 0deea445d6 Merge pull request #1337 from progrium/josegonzalez-buildstep Michael Hobbs 2015-07-23 11:12:26 -07:00
  • 84538e1c1d Update PREBUILT_STACK_URL to latest buildstep release Jose Diaz-Gonzalez 2015-07-23 13:33:11 -04:00
  • 97eefef04a Fix version Jose Diaz-Gonzalez 2015-07-22 14:36:48 -04:00
  • 04b9f0cb9a Fix version Jose Diaz-Gonzalez 2015-07-22 14:36:19 -04:00
  • b3ddea604a Fix docs link Jose Diaz-Gonzalez 2015-07-22 14:14:56 -04:00
  • 511d9717ec Merge pull request #1305 from progrium/template Jose Diaz-Gonzalez 2015-07-22 14:13:00 -04:00
  • c14f29b01b fix link to documentation [ci skip] Jose Diaz-Gonzalez 2015-07-22 14:07:44 -04:00
  • ccc3b810c7 Add missing Release Process link [ci skip] Jose Diaz-Gonzalez 2015-07-22 14:06:26 -04:00
  • 53a3438cf7 Link docs page Jose Diaz-Gonzalez 2015-07-11 11:54:50 -04:00
  • cafbb8a4f9 minor column tweak Jose Diaz-Gonzalez 2015-07-11 11:50:22 -04:00
  • 230cdaf996 change column sizes Jose Diaz-Gonzalez 2015-07-11 11:48:55 -04:00
  • 1ef42b527d add padding Jose Diaz-Gonzalez 2015-07-11 11:48:49 -04:00
  • cefe772330 remove todo Jose Diaz-Gonzalez 2015-07-11 11:44:43 -04:00
  • 6dc2b218c7 style tables after the fact Jose Diaz-Gonzalez 2015-07-11 11:44:27 -04:00
  • 025699cd01 Fix margin on pages Jose Diaz-Gonzalez 2015-07-11 00:48:44 -04:00
  • a8b1f4fae5 Attempt to add a sidebar and use fluid container positioning for non-home pages Jose Diaz-Gonzalez 2015-07-11 00:47:41 -04:00
  • 9b64298314 Use a fluid container Jose Diaz-Gonzalez 2015-07-11 00:38:12 -04:00
  • ed9801c031 Fix pattern url Jose Diaz-Gonzalez 2015-07-04 16:52:40 -04:00
  • 53f0b00d31 Make assets relative to current page Jose Diaz-Gonzalez 2015-07-04 16:49:02 -04:00
  • 222162fd9d Add static site assets Jose Diaz-Gonzalez 2015-07-04 16:46:45 -04:00
  • 3322ae6cc3 Custom home.html template Jose Diaz-Gonzalez 2015-07-04 16:18:39 -04:00
  • 8256d78007 Updated landing page Jose Diaz-Gonzalez 2015-07-04 16:16:55 -04:00
  • e3669479ce Beginning new template changes Jose Diaz-Gonzalez 2015-07-04 16:15:48 -04:00
  • 430bd3f01a Fix typo and remove reference to dokku-alt issue. Felix Wolfsteller 2015-07-22 07:41:22 +02:00
  • 28ffcc887e Merge pull request #1334 from progrium/deb-creation Jose Diaz-Gonzalez 2015-07-21 21:04:53 -04:00
  • 5b06cd68ac Merge pull request #1335 from progrium/fix-michaelshobbs-name Jose Diaz-Gonzalez 2015-07-21 21:04:41 -04:00
  • 2e1580241c Fix name for michaelshobbs Jose Diaz-Gonzalez 2015-07-21 14:54:32 -04:00
  • f9ea2053b9 Fix pluginhook building and update package version Jose Diaz-Gonzalez 2015-07-21 14:53:57 -04:00
  • 6b67b2d647 Release 0.3.22 v0.3.22 Jose Diaz-Gonzalez 2015-07-21 12:17:22 -04:00
  • 385683c76a Merge pull request #1331 from alexkruegger/master Jose Diaz-Gonzalez 2015-07-20 10:50:55 -04:00
  • 9910fb03da fix bug in nginx.conf.template getting from /app directory alexkruegger 2015-07-20 14:02:44 +03:00
  • 68b3487355 Merge pull request #1324 from progrium/1323_mh-default-checks-docs Michael Hobbs 2015-07-17 08:00:15 -07:00
  • d2f2bc9ac1 update docs to reflect default checks. rename DOKKU_DEFAULT_WAIT to DOKKU_DEFAULT_CHECKS_WAIT. refs #1323 Michael Hobbs 2015-07-17 07:25:35 -07:00
  • d4ea8520ac In doc: mention alternative to nginx.conf templates: include-dir. Felix Wolfsteller 2015-07-16 11:50:45 +02:00
  • 1ce657565f Merge pull request #1319 from MWers/mw-fix-spelling-issues Michael Hobbs 2015-07-14 16:29:20 -07:00
  • d457ffe7ee Spelling fix: 'comma seperated'=>'comma-separated' Matt Walker 2015-07-14 15:46:32 -07:00
  • 4bdff25969 Merge pull request #1312 from progrium/kilianc_hotfix-#1270 Jose Diaz-Gonzalez 2015-07-13 13:22:27 -04:00
  • c7cb014580 convenience functions for app container state Michael Hobbs 2015-07-13 08:24:46 -07:00
  • 633c595311 use docker inspect instead of docker ps grep pattern. closes #1281 Michael Hobbs 2015-07-12 16:44:55 -07:00
  • 0424d5a744 fixes #1270 faulty default container check Kilian Ciuffolo 2015-07-03 18:10:20 -07:00
  • 0a4c22dfea Merge pull request #1278 from progrium/nginx-template-from-app Jose Diaz-Gonzalez 2015-07-13 10:35:42 -04:00
  • f27cbe1325 Merge pull request #1313 from progrium/1309_mh-verify-app-in-deploy Jose Diaz-Gonzalez 2015-07-13 10:35:22 -04:00
  • 68b12ab46f Merge pull request #1298 from SonicHedgehog/fix-check-root Jose Diaz-Gonzalez 2015-07-13 10:31:21 -04:00
  • 8905387d16 Merge pull request #1311 from progrium/kilianc_hotfix-#1259 Jose Diaz-Gonzalez 2015-07-12 20:06:38 -04:00
  • ca1b17ea8d Use nginx.conf.template as the template name Jose Diaz-Gonzalez 2015-07-12 20:06:21 -04:00
  • 007946f52a Use simplified method for retrieving a container id Jose Diaz-Gonzalez 2015-07-12 20:02:29 -04:00
  • b0ca3aadb0 verify we have an app when deploy is called. fixes #1309 Michael Hobbs 2015-07-12 16:59:16 -07:00
  • 1be74988f1 Merge pull request #1310 from progrium/1261_mh-use-global-config Jose Diaz-Gonzalez 2015-07-12 19:31:25 -04:00
  • 3e58824377 Merge branch 'master' into kilianc_hotfix-#1259 Michael Hobbs 2015-07-12 16:27:10 -07:00
  • ee4fca572e mv dockerfile port logic to common function + tests. closes #1280 Michael Hobbs 2015-07-12 15:56:52 -07:00
  • 57b405ce76 use config:get for checks skipping variables Michael Hobbs 2015-07-12 15:23:51 -07:00
  • 43b179735b Merge pull request #1261 from Flink/bypass-checks-on-demand Jose Diaz-Gonzalez 2015-07-11 16:31:21 -04:00
  • 6895dd9936 Use get_container_ids method to retrieve container for nginx conf Jose Diaz-Gonzalez 2015-07-11 16:29:25 -04:00
  • 379a2e8908 Added documentation Assaf Arkin 2015-03-25 10:45:35 -07:00
  • 71b79da262 CHANGED extract nginx.conf.template from project Assaf Arkin 2015-03-23 13:34:03 -07:00
  • e985d18454 Merge pull request #1307 from progrium/1287-release-docs Jose Diaz-Gonzalez 2015-07-11 15:01:00 -04:00
  • 972cad7717 Add release documentation. Closes #1287 Jose Diaz-Gonzalez 2015-07-11 15:00:23 -04:00
  • 6f6a3e4715 Merge pull request #1306 from progrium/1177-clarify-installation Jose Diaz-Gonzalez 2015-07-11 14:44:19 -04:00
  • 815bc326a4 Clarify web/cli installation docs. Closes #1177. Closes #1170 Jose Diaz-Gonzalez 2015-07-11 14:43:43 -04:00
  • 25c107b164 Add checks-root test app to tests.mk Jakob Krigovsky 2015-07-11 13:50:53 +02:00
  • 7c02c6d31d Add test app checks-root Jakob Krigovsky 2015-07-11 13:40:09 +02:00
  • 3218e2b076 Allow for test apps that should fail deployment Jakob Krigovsky 2015-07-11 13:21:57 +02:00
  • 5f03518ec8 Fix check-deploy skipping the root path Jakob Krigovsky 2015-07-09 19:13:27 +02:00
  • 4629a9909b Merge pull request #1291 from progrium/1261_mh-config-args-refactor Michael Hobbs 2015-07-10 07:55:18 -07:00