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: | diff --git a/debian/postinst b/debian/postinst index e6a1f2412..5f4643b4d 100755 --- a/debian/postinst +++ b/debian/postinst @@ -100,12 +100,18 @@ case "$1" in exit 0 fi - db_get "dokku/vhost_enable" - if [ "$RET" = "true" ]; then - db_get "dokku/hostname" - echo "$RET" > "${DOKKU_ROOT}/VHOST" + if [ -f "${DOKKU_ROOT}/VHOST" ]; then + echo "VHOST file detected, skipping modification" else - rm -f "${DOKKU_ROOT}/VHOST" + 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 db_get "dokku/hostname" 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 diff --git a/plugins/git/functions b/plugins/git/functions index 37eeea70b..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/(?