github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
1,002 Commits 2 Branches 347 Tags
afc492e23f586627a02e60ab836134e8d9bfcd46
Commit Graph

1002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jose Diaz-Gonzalez
afc492e23f Merge pull request #978 from progrium/jg-docker-deps 
[ci skip] Add apparmor and cgroup-lite as pre-dependencies for dokku
 2015-02-16 23:02:44 -05:00
Jose Diaz-Gonzalez
859e400587 [ci skip] Add apparmor and cgroup-lite as pre-dependencies for dokku 
Certain operating systems do not have these packages by default and they are required by lxc-docker
 2015-02-16 23:02:02 -05:00
Jose Diaz-Gonzalez
9c15f89a35 Merge pull request #975 from progrium/971-mh-simplify-ssl-nginx 
simplify SSL hostname handling and avoid overwriting variables. refs #971
 2015-02-12 18:22:57 -05:00
Michael Hobbs
12777d9bf0 simplify SSL hostname handling and avoid overwriting variables. refs #971 2015-02-12 13:27:47 -08:00
Jose Diaz-Gonzalez
64fa098d2c Merge pull request #974 from progrium/mh-cleaner-pipefail-guard 
don't use set to guard against pipefail
 2015-02-11 21:52:53 -05:00
Michael Hobbs
043b055558 don't use set to guard against pipefail 2015-02-11 17:48:55 -08:00
Jose Diaz-Gonzalez
870ca86ba6 Release 0.3.15 v0.3.15 2015-02-11 17:12:59 -05:00
Jose Diaz-Gonzalez
df936fb057 Merge pull request #962 from progrium/debian-building 
Update debian package building due to manage generation changes
 2015-02-10 14:40:05 -05:00
Jose Diaz-Gonzalez
3f0b3f8385 Merge pull request #966 from djelic/master 
handle upgrade in debian/preinst script
 2015-02-10 13:19:13 -05:00
Jose Diaz-Gonzalez
c90c6b3f45 Merge pull request #964 from progrium/963-mh-dont-allow-short-args-globally 
only look for long args in global space. allows for short args in plugins. closes #963
 2015-02-10 13:17:30 -05:00
David Jelic
d5ceda6da7 handle upgrade in debian/preinst script 2015-02-10 11:47:20 +01:00
Michael Hobbs
e5fb746a7f only look for long args in global space. allows for short args in plugins. closes #963 2015-02-09 16:59:07 -08:00
Jose Diaz-Gonzalez
7c7896029c Update debian package building due to manage generation changes 2015-02-09 13:24:38 -05:00
Jose Diaz-Gonzalez
8b7b2107f4 Merge pull request #960 from progrium/mh-style-refactor 
use consistent bash shebang. closes #959
 2015-02-09 02:37:28 -05:00
Michael Hobbs
ef583eef66 use consistent bash shebang. closes #959 2015-02-08 22:34:35 -08:00
Jose Diaz-Gonzalez
c2fa43384c Merge pull request #954 from progrium/mh-dockerfile-support 
dockerfile support
 2015-02-08 17:38:22 -05:00
Michael Hobbs
179a5e611b introduce pre/post-build-buildstep and pre/post-release-buildstep 2015-02-07 17:56:01 -08:00
Michael Hobbs
7357df7c9d first pass at dockerfile support 2015-02-07 17:56:01 -08:00
Jose Diaz-Gonzalez
122df4cdaf Merge pull request #957 from progrium/mh-dokku-shell 
implement dokku shell and ls (by @plietar). refs #312
 2015-02-07 19:49:52 -05:00
Michael Hobbs
1cfb1fc3fc implement dokku shell and ls (by @plietar). refs #312 2015-02-07 14:46:17 -08:00
Michael Hobbs
b10120af12 Merge pull request #955 from progrium/mh-small-style-refactor 
quick style refactor
 2015-02-07 14:40:04 -08:00
Michael Hobbs
7af7355441 Merge pull request #956 from progrium/mh-comment-out-skipped-unit-tests 
comment out skipped tests as we pay the cost for setup() and teardown() anyway
 2015-02-07 14:38:18 -08:00
Michael Hobbs
a9c1ed0c6d [ci skip] comment out skipped tests as we pay the cost for setup() and teardown() anyway 2015-02-07 14:37:30 -08:00
Michael Hobbs
e931930faa implement parallel_runner to make ci faster 2015-02-07 14:12:05 -08:00
Michael Hobbs
66f7fa3192 lintball 2015-02-07 11:49:35 -08:00
Michael Hobbs
959c51eb50 refactor function defs to be posix-like. remove usage of force positional argument in tests. support --force like arguments in client" 2015-02-07 11:35:04 -08:00
Jose Diaz-Gonzalez
c4ef29173c Merge pull request #952 from progrium/951-mh-document-args-over-ssh 
[ci skip] document cli args over ssh. closes #951
 2015-02-07 12:34:24 -05:00
Michael Hobbs
fe3e079a93 [ci skip] rename -rm to --rm for DOKKU_RM_CONTAINER 2015-02-07 09:28:09 -08:00
Michael Hobbs
57acf3b295 [ci skip] document cli args over ssh. closes #951 2015-02-06 21:59:34 -08:00
Jose Diaz-Gonzalez
6f92385608 Merge pull request #950 from progrium/mh-count-code-only 
do not count blank lines
 2015-02-06 17:42:26 -05:00
Michael Hobbs
f5bceb955c [ci skip] do not count blank lines 2015-02-06 14:37:55 -08:00
Jose Diaz-Gonzalez
c35a024d39 Release 0.3.14 v0.3.14 2015-02-06 14:06:29 -05:00
Michael Hobbs
a02f32e985 Merge pull request #949 from progrium/mh-common-functions 
first stab at a common functions library. include argument parsing and a few definitions wired up. closes #932. closes #945
 2015-02-06 10:48:03 -08:00
Michael Hobbs
9164740117 rename log functions with dokku_log_ prefix 2015-02-06 08:28:14 -08:00
Michael Hobbs
371ba99540 include echo functions that don't print when quiet arg is passed 2015-02-05 12:38:59 -08:00
Michael Hobbs
6ad65dd9b4 first stab at a common functions library. include argument parsing and a few definitions wired up. closes #932. closes #945 2015-02-05 11:32:46 -08:00
Jose Diaz-Gonzalez
72a58bbda3 Merge pull request #927 from progrium/906-mh-docker-args-phase-pluginhooks 
support both docker-args PHASE and docker-args-PHASE for the time being. closes #906
 2015-02-04 11:13:14 -05:00
Michael Hobbs
30d660335f Merge pull request #941 from progrium/931-mh-source-glabal-env-deploy-run 
source global env prior to app env. closes #931
 2015-02-04 07:32:12 -08:00
Jose Diaz-Gonzalez
d891e2214a Merge pull request #942 from progrium/mh-clojure-test-app 
test clojure app
 2015-02-03 20:43:07 -05:00
Michael Hobbs
1c02ef9674 test clojure app 2015-02-03 16:46:04 -08:00
Michael Hobbs
b48464a7e2 Merge pull request #925 from progrium/mh-ps-rebuild 
implement rebuild command that reuses git_archive_all
 2015-02-03 14:56:44 -08:00
Michael Hobbs
5fb30ab934 source global env prior to app env. closes #931 2015-02-03 13:47:20 -08:00
Jose Diaz-Gonzalez
89df6eeded Merge pull request #936 from progrium/929-mh-conditionally-run-buildstack 
only execute build stack if we have access to /var/run/docker.sock. closes #929
 2015-02-03 15:47:47 -05:00
Jose Diaz-Gonzalez
2a4caf95b4 Merge pull request #938 from vincentfretin/patch-6 
enable ssl_prefer_server_ciphers
 2015-02-03 15:46:43 -05:00
Jose Diaz-Gonzalez
edfb2ab990 Merge pull request #940 from progrium/mh-valid-composer-json 
use valid composer json with specified php runtime
 2015-02-03 15:46:34 -05:00
Michael Hobbs
bf7b44f215 use valid composer json with specified php runtime 2015-02-03 08:57:44 -08:00
Vincent Fretin
955f95e899 enable ssl_prefer_server_ciphers 
Since we create /etc/nginx/nginx.conf we don't have "ssl_prefer_server_ciphers on" option enabled anymore, enable it in dokku.conf
 2015-02-03 09:52:18 +01:00
Michael Hobbs
14bff0679f only execute build stack if we have access to /var/run/docker.sock. closes #929 2015-02-02 15:46:57 -08:00
Jose Diaz-Gonzalez
2dad1afa57 Merge pull request #933 from progrium/930-mh-nginx-sslcrt-docs 
[ci skip] remove references to .pem. closes #930
 2015-02-02 11:56:54 -05:00
Michael Hobbs
e8118d1af8 [ci skip] remove references to .pem. closes #930 2015-02-02 08:56:06 -08:00