From c9af7e4cfaddb5f7045365294cfdde92b121c526 Mon Sep 17 00:00:00 2001 From: Vincent Tavernier Date: Mon, 2 Oct 2017 09:26:13 +0200 Subject: [PATCH 1/8] Fix #2915 Add forward slash cleanup of the app name for the git-upload-pack command. Prevents is_valid_app_name from removing the application folder on `git fetch`. --- plugins/git/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git/functions b/plugins/git/functions index 37eeea70b..64ec4449b 100755 --- a/plugins/git/functions +++ b/plugins/git/functions @@ -153,7 +153,7 @@ git_build() { git_upload_pack_cmd() { declare desc="executes git-upload-pack" local cmd="git-upload-pack" - local APP="$(echo "$2" | perl -pe 's/(? Date: Mon, 2 Oct 2017 17:37:17 +0200 Subject: [PATCH 2/8] Fix #2927 Fix to prevent dokku upgrade on debian systems overwrites ${DOKKU_ROOT}/VHOST --- debian/postinst | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/postinst b/debian/postinst index e6a1f2412..f43db7b10 100755 --- a/debian/postinst +++ b/debian/postinst @@ -100,14 +100,16 @@ case "$1" in exit 0 fi - db_get "dokku/vhost_enable" - if [ "$RET" = "true" ]; then - db_get "dokku/hostname" - echo "$RET" > "${DOKKU_ROOT}/VHOST" - else - rm -f "${DOKKU_ROOT}/VHOST" + if [ ! -f "${DOKKU_ROOT}/VHOST" ]; then + db_get "dokku/vhost_enable" + if [ "$RET" = "true" ]; then + db_get "dokku/hostname" + echo "$RET" > "${DOKKU_ROOT}/VHOST" + else + rm -f "${DOKKU_ROOT}/VHOST" + fi fi - + db_get "dokku/hostname" echo "$RET" > "${DOKKU_ROOT}/HOSTNAME" From f664ad1cdeb00812b28c987692a7e7edf2cff609 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 2 Oct 2017 11:40:31 -0400 Subject: [PATCH 3/8] fix: remove extra whitespace --- debian/postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/postinst b/debian/postinst index f43db7b10..7b4d68054 100755 --- a/debian/postinst +++ b/debian/postinst @@ -109,7 +109,7 @@ case "$1" in rm -f "${DOKKU_ROOT}/VHOST" fi fi - + db_get "dokku/hostname" echo "$RET" > "${DOKKU_ROOT}/HOSTNAME" From 093414b846a269570b35f6dd6291f54b1085cb69 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 2 Oct 2017 11:48:29 -0400 Subject: [PATCH 4/8] feat: add logging --- debian/postinst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/postinst b/debian/postinst index 7b4d68054..5f4643b4d 100755 --- a/debian/postinst +++ b/debian/postinst @@ -100,12 +100,16 @@ case "$1" in exit 0 fi - if [ ! -f "${DOKKU_ROOT}/VHOST" ]; then + if [ -f "${DOKKU_ROOT}/VHOST" ]; then + echo "VHOST file detected, skipping modification" + else db_get "dokku/vhost_enable" if [ "$RET" = "true" ]; then db_get "dokku/hostname" + echo "Setting VHOST contents to $RET" echo "$RET" > "${DOKKU_ROOT}/VHOST" else + echo "VHOST disabled via debconf, removing" rm -f "${DOKKU_ROOT}/VHOST" fi fi From c25ef5dc4c6b8cc8a12c4d5a521373fef4d92920 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 2 Oct 2017 11:57:50 -0400 Subject: [PATCH 5/8] fix: Declare and assign separately to avoid masking return values --- plugins/git/functions | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/git/functions b/plugins/git/functions index 64ec4449b..051ceb54d 100755 --- a/plugins/git/functions +++ b/plugins/git/functions @@ -152,8 +152,9 @@ git_build() { git_upload_pack_cmd() { declare desc="executes git-upload-pack" - local cmd="git-upload-pack" - local APP="$(echo "$2" | perl -pe 's/(? Date: Thu, 5 Oct 2017 22:28:24 -0400 Subject: [PATCH 6/8] fix: upgrade git package for CI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 41cca7a53..b163dc218 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: ./tests/ci/setup.sh - run: | sudo apt-get remove -qq -y git - sudo apt-get install -qq -y git=1:1.9.1-1ubuntu0.6 git-man=1:1.9.1-1ubuntu0.6 + sudo apt-get install -qq -y git=1:1.9.1-1ubuntu0.7 git-man=1:1.9.1-1ubuntu0.7 - run: | echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup - run: | From aeba3f226923887a75fb34a0bd90e916595e0456 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 6 Oct 2017 19:57:04 +0900 Subject: [PATCH 7/8] Fix comment [ci skip] --- plugins/network/src/subcommands/report/report.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/network/src/subcommands/report/report.go b/plugins/network/src/subcommands/report/report.go index 382245cb8..462c7afd9 100644 --- a/plugins/network/src/subcommands/report/report.go +++ b/plugins/network/src/subcommands/report/report.go @@ -41,7 +41,7 @@ func reportSingleApp(appName, infoFlag string) { common.LogFail(fmt.Sprintf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", "))) } -// set or clear a network property for an app +// displays a network report for one or more apps func main() { flag.Parse() appName := flag.Arg(1) From 6dcf695822a2b0fd8ce2cfb3bcef8943da96cb3e Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 6 Oct 2017 20:04:32 +0900 Subject: [PATCH 8/8] Fix version number [ci skip] in document of Container network interface binding --- docs/networking/proxy-management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/networking/proxy-management.md b/docs/networking/proxy-management.md index f4f02ef0e..2224dc598 100644 --- a/docs/networking/proxy-management.md +++ b/docs/networking/proxy-management.md @@ -21,7 +21,7 @@ In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into > Changed as of 0.11.0 -From Dokku versions `0.5.0` until `0.11.0`, enabling or disabling an application's proxy would **also** control whether or not the application was bound to all interfaces - e.g. `0.0.0.0`. As of `0.10.0`, this is now controlled by the network plugin. Please see the [network documentation](/docs/networking/network.md#container-network-interface-binding) for more information. +From Dokku versions `0.5.0` until `0.11.0`, enabling or disabling an application's proxy would **also** control whether or not the application was bound to all interfaces - e.g. `0.0.0.0`. As of `0.11.0`, this is now controlled by the network plugin. Please see the [network documentation](/docs/networking/network.md#container-network-interface-binding) for more information. ### Displaying proxy reports about an app