Michael Hobbs
|
a91165d3e6
|
set DOKKU_APP_TYPE to IMAGE_SOURCE_TYPE value use in test case
|
2016-03-09 16:35:48 -05:00 |
|
Michael Hobbs
|
37584be044
|
Merge pull request #1953 from dokku/1579_mh-commands_refactor
subcommands/bashstyle refactor
|
2016-03-08 16:35:30 -05:00 |
|
Michael Hobbs
|
42520a6126
|
remove documentation of old plugin structure
|
2016-03-08 15:32:20 -05:00 |
|
Michael Hobbs
|
987c5cfb9c
|
use declare for description variable
|
2016-03-08 15:30:34 -05:00 |
|
Michael Hobbs
|
d8e00f4f8a
|
balance tests
|
2016-03-04 20:59:27 -08:00 |
|
Michael Hobbs
|
3bffba945a
|
show timing for each bats file and overall test run
|
2016-03-04 20:59:17 -08:00 |
|
Michael Hobbs
|
4204d210c1
|
port --app syntax to dokku_client. closes #1638
|
2016-03-04 12:38:23 -08:00 |
|
Michael Hobbs
|
62731aa434
|
support parallel tests on same host
|
2016-03-03 22:11:35 -08:00 |
|
Michael Hobbs
|
7dd8d635bc
|
show container type when printing container output
|
2016-03-03 22:11:35 -08:00 |
|
Michael Hobbs
|
718b129041
|
allow overriding of vagrant cpus
|
2016-03-03 22:11:35 -08:00 |
|
Michael Hobbs
|
3aa8bbd629
|
move standard commands into subcommands
|
2016-03-03 22:11:35 -08:00 |
|
Michael Hobbs
|
63fb33d03d
|
Merge pull request #1958 from u2mejc/u2mejc-issue1957
Enable debug output for dokku global exports in trace
|
2016-03-02 20:07:06 -08:00 |
|
Michael Hobbs
|
a146849a58
|
Merge pull request #1936 from dokku/mh-shellcheck-cleanup
cleanup shellcheck SC2086
|
2016-02-23 09:03:24 -08:00 |
|
Michael Hobbs
|
ff9bb2cbd7
|
Merge pull request #1935 from dokku/mh-remove-nginx-test
remove unnecessary nginx test
|
2016-02-22 12:43:20 -08:00 |
|
Michael Hobbs
|
a9de2994bf
|
Merge pull request #1836 from dokku/1824_mh-app-json
support scripts.dokku. in app.json
|
2016-02-20 06:35:40 -08:00 |
|
Michael Hobbs
|
9531a7afb7
|
Merge pull request #1923 from dokku/mh-typo-gen-scale-file
fix typo in generate_scale_file()
|
2016-02-17 14:57:07 -08:00 |
|
Michael Hobbs
|
543642eb5f
|
Merge pull request #1872 from kenips/support/better_logs_for_checks
Update log to better reflect what's going on with CHECKS
|
2016-01-18 17:48:22 -08:00 |
|
Michael Hobbs
|
71351f1a02
|
Merge pull request #1871 from dokku/mh-support-bash-4.2
support bash 4.2 so we don't have to modify all plugin test envs
|
2016-01-17 22:01:33 -08:00 |
|
Michael Hobbs
|
999cbc0739
|
Merge pull request #1864 from znz/no-longer-need-to-set-nullglob
no longer need to set nullglob
|
2016-01-14 08:12:37 -08:00 |
|
Michael Hobbs
|
bc00acb5ff
|
Merge pull request #1848 from u2mejc/u2mejc_docker-options_functions
Move docker-options functions to functions file, rework phase_file_path
|
2016-01-13 11:28:00 -08:00 |
|
Michael Hobbs
|
34a5766ce3
|
Merge pull request #1862 from dokku/mh-update-circleci-bash
install bash 4.3.x on circleci
|
2016-01-12 20:12:04 -08:00 |
|
Michael Hobbs
|
d98ed122a6
|
Merge pull request #1844 from dokku/mh-named-containers
named-containers: handle multiple old containers and don't attempt to rename a dead container
|
2016-01-07 20:19:31 -08:00 |
|
Michael Hobbs
|
30be9b7959
|
Merge pull request #1845 from dokku/mh-update-node-test-apps
update nodejs in test apps
|
2016-01-07 20:19:14 -08:00 |
|
Michael Hobbs
|
bfecd3beb4
|
Merge pull request #1842 from dokku/mh-skip-cleanup-in-ci
skip cleanup in ci to speed up tests
|
2016-01-07 10:25:27 -08:00 |
|
Michael Hobbs
|
606e27653f
|
Merge pull request #1837 from dokku/mh-add-some-deploy-tests
add back some deploy tests that test dokku functionality
|
2016-01-06 21:27:50 -08:00 |
|
Michael Hobbs
|
c8c3381dd6
|
Merge pull request #1834 from jvanbaarsen/ignore-osx-hidden-files
Make sure we ignore hidden files in the SSL cert check
|
2016-01-06 07:58:35 -08:00 |
|
Michael Hobbs
|
68b02c40a7
|
Merge pull request #1827 from dokku/mh-use-docker-circleci-1.9.x
use docker 1.9.0 on circleci
|
2016-01-05 13:05:11 -08:00 |
|
Michael Hobbs
|
16544a77e2
|
Merge pull request #1828 from dokku/mh-label-dokku-containers
label all dokku containers
|
2016-01-05 12:39:24 -08:00 |
|
Michael Hobbs
|
1c6916c68f
|
Merge pull request #1829 from dokku/mh-dokku-report
implement dokku report command
|
2016-01-05 12:25:45 -08:00 |
|
Michael Hobbs
|
32f1bc5396
|
Merge pull request #1789 from lvillani/skip-deploy
Make it possible to skip a deploy
|
2015-12-21 17:11:21 -08:00 |
|
Michael Hobbs
|
9d0f099e86
|
Merge pull request #1791 from dokku/mh-pare-down-test-suite
don't run app deploy tests and spread out unit tests to 4 containers
|
2015-12-21 16:36:25 -08:00 |
|
Michael Hobbs
|
d320203c2c
|
Merge pull request #1793 from dokku/1792_mh-comments-in-procfile
filter out Procfile comments
|
2015-12-21 09:07:36 -08:00 |
|
Michael Hobbs
|
a24b12eece
|
Merge pull request #1790 from dokku/mh-dev-env-inputrc
use pgup/pgdown for history shortcut in dev env
|
2015-12-17 13:31:01 -08:00 |
|
Michael Hobbs
|
e4a23048ec
|
Merge pull request #1784 from duboff/patch-1
Tiny fix in SSL documentation
|
2015-12-16 17:29:00 -08:00 |
|
Michael Hobbs
|
b3e9893e9d
|
Merge pull request #1778 from mmerickel/optimize-build-clone
optimize git clone for building using depth=1
|
2015-12-16 15:47:48 -08:00 |
|
Michael Hobbs
|
6366aad1e7
|
Merge pull request #1781 from jvanbaarsen/add-post-config-update-hook
Add post config update hook
|
2015-12-16 14:00:01 -08:00 |
|
Michael Hobbs
|
208d3c13d9
|
Merge pull request #1780 from jvanbaarsen/add-domain-plugin-documentation
Add documentation for the new domain plugin hooks
|
2015-12-16 13:59:53 -08:00 |
|
Michael Hobbs
|
e408351ec6
|
Merge pull request #1777 from dokku/mh-test-labels
format test labels
|
2015-12-16 12:09:31 -08:00 |
|
Michael Hobbs
|
51cd991174
|
Merge pull request #1782 from dokku/mh-make-docker-cp-work-on-ci
make docker cp work on circleci
|
2015-12-16 10:49:34 -08:00 |
|
Michael Hobbs
|
da70a18601
|
Merge pull request #1739 from progrium/mh-clarify-nginx-template-location
clarify location of nginx.conf.template in app repo
|
2015-12-02 09:08:14 -08:00 |
|
Michael Hobbs
|
0606d1a805
|
Merge pull request #1732 from progrium/1729_mh-fix-certs-gen
do not chown file that doesn't exist
|
2015-12-01 09:29:16 -08:00 |
|
Michael Hobbs
|
6495537d44
|
Merge pull request #1712 from progrium/1609_filter-link-with-dockerfile
filter incompatible docker option when building dockerfile vs herokuish apps
|
2015-11-25 11:14:31 -08:00 |
|
Michael Hobbs
|
f188e6ff3d
|
Merge pull request #1715 from progrium/mh-use-official-static-fork
use patched static buildpack in test
|
2015-11-25 09:08:39 -08:00 |
|
Michael Hobbs
|
6a51ec0f64
|
Merge pull request #1709 from progrium/1614_mh-wildcard-domains
fix Must specify DOMAIN error over ssh (supercedes #1691)
|
2015-11-19 14:10:20 -05:00 |
|
Michael Hobbs
|
aa1ffd1aab
|
Merge pull request #1707 from Flink/fix-named-container-filter-match
Do a perfect match on the container name
|
2015-11-19 12:09:33 -05:00 |
|
Michael Hobbs
|
11d396e6ef
|
Merge pull request #1706 from progrium/1704_mh-rm-container
app/global override for DOKKU_RM_CONTAINER
|
2015-11-19 12:09:20 -05:00 |
|
Michael Hobbs
|
a2ccbcbbfb
|
Merge pull request #1701 from progrium/mh-dont-call-nginx-build-twice
don't call nginx_build_config twice
|
2015-11-19 12:09:02 -05:00 |
|
Michael Hobbs
|
da91841ac6
|
Merge pull request #1698 from pmvieira/pv/vagrant-with-curl
if the repo we are pushing has a CHECKS file...
|
2015-11-19 07:43:27 -05:00 |
|
Michael Hobbs
|
3e466917fd
|
Merge pull request #1700 from progrium/1697_mh-copy-nginx-ssl-template-from-container
copy nginx.ssl.template from app container
|
2015-11-18 19:26:49 -05:00 |
|
Michael Hobbs
|
d2f288d3a9
|
Merge pull request #1699 from progrium/1685_mh-print-dokku-scale-location
print where we find DOKKU_SCALE when we find it
|
2015-11-18 17:45:37 -05:00 |
|
Michael Hobbs
|
cff8e27545
|
Merge pull request #1682 from progrium/1678_mh-nullglob-fix
set nullglob when looking for PORT files
|
2015-11-11 15:51:02 -08:00 |
|
Michael Hobbs
|
ef3480703a
|
Merge pull request #1563 from kdomanski/cleanup-dead
cleanup dead containers
|
2015-10-15 15:01:26 -07:00 |
|
Michael Hobbs
|
92e9ab84ac
|
update plugin command
|
2015-09-30 09:13:41 -07:00 |
|
Michael Hobbs
|
5e9c88ca63
|
Merge pull request #1496 from callahad/issue-1495
Don't prompt users when installing dokku package
|
2015-09-23 16:01:44 -07:00 |
|
Michael Hobbs
|
e345cb6b93
|
Merge pull request #1494 from callahad/issue-1493
Correctly install packages for DOKKU_TAG=v0.4.0
|
2015-09-23 15:59:48 -07:00 |
|
Michael Hobbs
|
39aedd158b
|
Merge pull request #1468 from progrium/mh-install-deps-in-bootstrap
clean up semver logic and run install-dependencies after package installation
|
2015-09-15 10:48:01 -07:00 |
|
Michael Hobbs
|
c62ac4bcc3
|
Merge pull request #1372 from SonicHedgehog/default-nginx-conf
Do no longer force-install a default nginx.conf
|
2015-09-15 10:47:57 -07:00 |
|
Michael Hobbs
|
51e8b540cc
|
Merge pull request #1458 from progrium/mh-trace
set TRACE=true when DOKKU_TRACE is set
|
2015-09-10 14:36:33 -07:00 |
|
Michael Hobbs
|
03165ee3f8
|
Merge pull request #1439 from progrium/1438_mh-sleepy-tar-test
sleep for 5 to give nginx a moment
|
2015-09-01 17:03:31 -07:00 |
|
Michael Hobbs
|
84fff1c2e2
|
Merge pull request #1419 from u2mejc/dokku-help-tty
Fix dokku ps <app> over ssh
|
2015-08-27 10:36:37 -07:00 |
|
Michael Hobbs
|
1622fc3673
|
Merge pull request #1407 from ertrzyiks/ertrzyiks-patch-1
Update variable name in docs
|
2015-08-25 08:22:31 -07:00 |
|
Michael Hobbs
|
461e79386a
|
Merge pull request #1415 from tilgovi/remove-norestart-uses
Remove uses of (un)set-norestart
|
2015-08-24 16:31:46 -07:00 |
|
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 |
|
Michael Hobbs
|
b0d55ce589
|
Merge pull request #1354 from alessio/events-new-receive-branch-hook
Log receive-branch pluginhook
|
2015-07-30 08:39:02 -07:00 |
|
Michael Hobbs
|
fd3f84669b
|
Merge pull request #1292 from progrium/mh-columnar-help-output
use column to format help output
|
2015-07-28 10:51:50 -07:00 |
|
Michael Hobbs
|
d05df06f1a
|
Merge pull request #1349 from alexkruegger/master
add plugin dokku-app-configfiles
|
2015-07-28 08:51:03 -07:00 |
|
Michael Hobbs
|
3525f699f9
|
Merge pull request #1341 from progrium/1336_mh-use-dockerfile-port-sans-vhost
set and use $port whenever $PROC_TYPE == 'web'
|
2015-07-24 12:45:15 -07:00 |
|
Michael Hobbs
|
0deea445d6
|
Merge pull request #1337 from progrium/josegonzalez-buildstep
Update PREBUILT_STACK_URL to latest buildstep release
|
2015-07-23 11:12:26 -07: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
|
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 |
|
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
|
7ffca93ba8
|
Merge pull request #1299 from SonicHedgehog/x-forwarded-proto-https
Set X-Forwarded-Proto header if TLS is enabled when running checks
|
2015-07-09 16:39:08 -07:00 |
|
Michael Hobbs
|
8ea88c85b6
|
Merge pull request #1300 from progrium/1294_mh-fix-urls-output
fix urls command when NO_VHOST=1 + tests
|
2015-07-09 12:58:44 -07:00 |
|
Michael Hobbs
|
aa55f027a4
|
Merge pull request #1289 from progrium/mh-fix-random-test-failure
don't background cleanup
|
2015-07-06 07:01:10 -07:00 |
|
Michael Hobbs
|
cbbe7ca557
|
Merge pull request #1285 from alessio/pr-fix-events-docs-filename
Rename dokku-events-logs.md according to index.md
|
2015-07-05 19:07:25 -07:00 |
|
Michael Hobbs
|
483ca9627f
|
Merge pull request #1274 from progrium/1271_mh-fix-ls
parse correct section of path for dokku ls container type
|
2015-07-03 07:48:09 -07:00 |
|
Michael Hobbs
|
2698ce62e2
|
Merge pull request #1256 from alessio/pr-dokku-events
Implement events logging feature
|
2015-07-01 14:09:38 -07:00 |
|
Michael Hobbs
|
4d162aa209
|
Merge pull request #1245 from arthurschreiber/patch-1
Support config variables containing `\n`
|
2015-06-24 12:32:47 -07:00 |
|
Michael Hobbs
|
1aee972a82
|
Merge pull request #1237 from zyegfryed/patch-1
Typo (at at -> at)
|
2015-06-19 07:44:33 -07:00 |
|
Michael Hobbs
|
6ebb897150
|
Merge pull request #1232 from progrium/1231_mh-dockerfile-build-cache-control
allow passing of docker build options and document dockerfile deployment. closes #1231
|
2015-06-15 16:22:31 -07:00 |
|
Michael Hobbs
|
62906cd542
|
Merge pull request #1227 from Flink/dockerfile-build-without-cache
Use --no-cache when building Dockerfile
|
2015-06-11 13:37:45 -07:00 |
|
Michael Hobbs
|
dda2ac03ee
|
Merge pull request #1217 from kirushanth-sakthivetpillai/fix_broken_ssl_wildcard_redirect
Fix broken ssl wildcard redirect
|
2015-06-05 13:33:36 -07:00 |
|
Michael Hobbs
|
daeea6ba13
|
Merge pull request #1206 from rockymadden/patch-1
Handle for installs in /usr/local/bin and the like.
|
2015-06-02 10:45:41 -07:00 |
|
Michael Hobbs
|
6e0eb5938a
|
Merge pull request #1202 from progrium/1185_mh-filter-wildcard-server-name
filter out literal wildcard when deploying an unrelated domain. closes #1185
|
2015-05-20 06:43:14 -07:00 |
|
Michael Hobbs
|
b6b8f4ddc1
|
Merge pull request #1200 from progrium/mh-fix-lint-1198
fix lintball from #1198
|
2015-05-19 09:47:18 -07:00 |
|
Michael Hobbs
|
f86a6704bd
|
Merge pull request #1198 from 3onyc/fix-preinst
Check web_config before key_file (Fixes #1196)
|
2015-05-19 09:37:27 -07:00 |
|
Michael Hobbs
|
c5a74fac90
|
Merge pull request #1193 from progrium/1187_mh-docker-opts-over-ssh
handle docker opts over ssh without escaping quotes. closes #1187
|
2015-05-18 12:16:08 -07:00 |
|
Michael Hobbs
|
43869dd48d
|
Merge pull request #1118 from progrium/mh-ps-scale
container-level scaling
|
2015-05-18 11:27:28 -07:00 |
|
Michael Hobbs
|
da92419023
|
Merge pull request #1151 from LTe/docker-stop
Do not kill docker container with SIGKILL
|
2015-04-29 13:57:40 -07:00 |
|
Michael Hobbs
|
379ee525a8
|
Merge pull request #1144 from protonet/master
Allow git-remote with different port
|
2015-04-26 11:00:50 -07:00 |
|
Michael Hobbs
|
31fafe55d3
|
Merge pull request #1145 from progrium/1135_mh-docker-options-over-ssh
allow docker-options over ssh. plus test. closes #1135
|
2015-04-24 15:40:45 -07:00 |
|
Michael Hobbs
|
833f308d2f
|
Merge pull request #1147 from progrium/mh-parallelize-tests-plus-1-container
Utilize all 4 free CircleCI containers
|
2015-04-24 15:36:53 -07:00 |
|
Michael Hobbs
|
6225a4113c
|
Merge pull request #1102 from kblcuk/master
Sourcing app-specific ENV during check-deploy
|
2015-04-09 09:10:18 -07:00 |
|
Michael Hobbs
|
5c938fee8a
|
Merge pull request #1087 from progrium/mh-docker-options-ni-exit
make docker-options adhere to DOKKU_NOT_IMPLEMENTED_EXIT pattern
|
2015-04-03 11:32:24 -07:00 |
|
Michael Hobbs
|
2949b620d8
|
Merge pull request #1051 from Flink/dokku-airbrake-deploy-plugin
Add dokku-airbrake-deploy to plugins
|
2015-03-23 14:41:43 -07:00 |
|
Michael Hobbs
|
65af77e1bc
|
Merge pull request #1042 from progrium/1005_mh-add-xip-test
Update to Support xip.io wildcard DNS as a VHOST
|
2015-03-19 13:16:59 -07:00 |
|
Michael Hobbs
|
fdec668646
|
Merge pull request #1040 from ebeigarts/dokku-slack
Add dokku-slack plugin information
|
2015-03-19 06:04:41 -07:00 |
|
Michael Hobbs
|
986e8f7b25
|
Merge pull request #1029 from broadly/checks-enhancements
ADDED several enhancements for CHECKS file:
|
2015-03-14 22:05:20 -07:00 |
|
Michael Hobbs
|
fffa6a1bc5
|
Merge pull request #1031 from progrium/mh-fix-circleci
CI upgraded to 1.5.0. downgrading seems to break things?
|
2015-03-14 19:22:49 -07:00 |
|
Michael Hobbs
|
bc00b5bfa8
|
Merge pull request #1027 from nickstenning/add-webhooks-plugin
Add webhooks plugin to documentation
|
2015-03-10 07:33:33 -07:00 |
|