Commit Graph
14224 Commits
Author SHA1 Message Date
Jose Diaz-Gonzalez 222162fd9d Add static site assets
[ci skip]
2015-07-22 14:05:22 -04:00
Jose Diaz-Gonzalez 3322ae6cc3 Custom home.html template 2015-07-22 14:05:22 -04:00
Jose Diaz-Gonzalez 8256d78007 Updated landing page
[ci skip]
2015-07-22 14:05:22 -04:00
Jose Diaz-Gonzalez e3669479ce Beginning new template changes
[ci skip]
2015-07-22 14:04:21 -04:00
Felix Wolfsteller 430bd3f01a Fix typo and remove reference to dokku-alt issue. 2015-07-22 07:41:22 +02:00
Jose Diaz-Gonzalez 28ffcc887e Merge pull request #1334 from progrium/deb-creation
Fix pluginhook building and update package version
2015-07-21 21:04:53 -04:00
Jose Diaz-Gonzalez 5b06cd68ac Merge pull request #1335 from progrium/fix-michaelshobbs-name
Fix name for michaelshobbs
2015-07-21 21:04:41 -04:00
Jose Diaz-Gonzalez 2e1580241c Fix name for michaelshobbs 2015-07-21 14:54:32 -04:00
Jose Diaz-Gonzalez f9ea2053b9 Fix pluginhook building and update package version 2015-07-21 14:53:57 -04:00
Jose Diaz-Gonzalez 6b67b2d647 Release 0.3.22 v0.3.22 2015-07-21 12:18:30 -04:00
Jose Diaz-Gonzalez 385683c76a Merge pull request #1331 from alexkruegger/master
[bugfix] in nginx.conf.template getting from /app directory
2015-07-20 10:50:55 -04:00
alexkruegger 9910fb03da fix bug in nginx.conf.template getting from /app directory 2015-07-20 14:02:44 +03:00
Michael Hobbs 68b3487355 Merge pull request #1324 from progrium/1323_mh-default-checks-docs
update docs to reflect default checks
2015-07-17 08:00:15 -07: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
Felix Wolfsteller d4ea8520ac In doc: mention alternative to nginx.conf templates: include-dir. 2015-07-16 11:50:45 +02:00
Michael Hobbs 1ce657565f Merge pull request #1319 from MWers/mw-fix-spelling-issues
Spelling fix: 'comma seperated'=>'comma-separated'
2015-07-14 16:29:20 -07:00
Matt Walker d457ffe7ee Spelling fix: 'comma seperated'=>'comma-separated' 2015-07-14 15:46:32 -07:00
Jose Diaz-Gonzalez 4bdff25969 Merge pull request #1312 from progrium/kilianc_hotfix-#1270
fixes #1270 faulty default container check (uses docker inspect)
2015-07-13 13:22:27 -04: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 f27cbe1325 Merge pull request #1313 from progrium/1309_mh-verify-app-in-deploy
verify we have an app when deploy is called
2015-07-13 10:35:22 -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 8905387d16 Merge pull request #1311 from progrium/kilianc_hotfix-#1259
ignore protocol of Dockerfile EXPOSE (refs: #1280)
2015-07-12 20:06:38 -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 b0ca3aadb0 verify we have an app when deploy is called. fixes #1309 2015-07-12 16:59:16 -07:00
Jose Diaz-Gonzalez 1be74988f1 Merge pull request #1310 from progrium/1261_mh-use-global-config
use config:get for checks skipping variables
2015-07-12 19:31:25 -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
Michael Hobbs 57b405ce76 use config:get for checks skipping variables 2015-07-12 15:23:51 -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 379a2e8908 Added documentation 2015-07-11 15:06:56 -04:00
Assaf Arkin 71b79da262 CHANGED extract nginx.conf.template from project 2015-07-11 15:05:06 -04:00
Jose Diaz-Gonzalez e985d18454 Merge pull request #1307 from progrium/1287-release-docs
Add release documentation. Closes #1287
2015-07-11 15:01:00 -04:00
Jose Diaz-Gonzalez 972cad7717 Add release documentation. Closes #1287
[ci skip]
2015-07-11 15:00:37 -04:00
Jose Diaz-Gonzalez 6f6a3e4715 Merge pull request #1306 from progrium/1177-clarify-installation
Clarify web/cli installation docs. Closes #1177. Closes #1170
2015-07-11 14:44:19 -04:00
Jose Diaz-Gonzalez 815bc326a4 Clarify web/cli installation docs. Closes #1177. Closes #1170
[ci skip]
2015-07-11 14:43:50 -04:00
Jakob Krigovsky 25c107b164 Add checks-root test app to tests.mk 2015-07-11 14:39:25 +02:00
Jakob Krigovsky 7c02c6d31d Add test app checks-root 2015-07-11 13:58:55 +02:00
Jakob Krigovsky 3218e2b076 Allow for test apps that should fail deployment 2015-07-11 13:58:52 +02: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
Jose Diaz-Gonzalez 16a0ca5f70 Merge pull request #1302 from econya/master
in nginx doc, mention where original templates are found by default.
2015-07-10 10:28:15 -04:00
Jose Diaz-Gonzalez 5192bb62fd Merge pull request #1301 from mixxorz/add-reset-mtime-plugin-list
Add reset mtime plugin list
2015-07-10 10:21:22 -04:00
Felix Wolfsteller f68b126bc9 fix typo 2015-07-10 12:22:07 +02:00
Felix Wolfsteller bf1ff080b6 in nginx conf mention how to apply template changes (i assume deploy is the answer). 2015-07-10 12:21:29 +02:00
Felix Wolfsteller bff273d625 in nginx doc, mention where original templates are found by default. 2015-07-10 12:08:29 +02:00