Merge branch 'master' into feature-config-golang
This commit is contained in:
@@ -11,7 +11,7 @@ jobs:
|
|||||||
./tests/ci/setup.sh
|
./tests/ci/setup.sh
|
||||||
- run: |
|
- run: |
|
||||||
sudo apt-get remove -qq -y git
|
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: |
|
- run: |
|
||||||
echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup
|
echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup
|
||||||
- run: |
|
- run: |
|
||||||
|
|||||||
16
debian/postinst
vendored
16
debian/postinst
vendored
@@ -100,12 +100,18 @@ case "$1" in
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
db_get "dokku/vhost_enable"
|
if [ -f "${DOKKU_ROOT}/VHOST" ]; then
|
||||||
if [ "$RET" = "true" ]; then
|
echo "VHOST file detected, skipping modification"
|
||||||
db_get "dokku/hostname"
|
|
||||||
echo "$RET" > "${DOKKU_ROOT}/VHOST"
|
|
||||||
else
|
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
|
fi
|
||||||
|
|
||||||
db_get "dokku/hostname"
|
db_get "dokku/hostname"
|
||||||
|
|||||||
@@ -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
|
> 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
|
### Displaying proxy reports about an app
|
||||||
|
|
||||||
|
|||||||
@@ -152,8 +152,9 @@ git_build() {
|
|||||||
|
|
||||||
git_upload_pack_cmd() {
|
git_upload_pack_cmd() {
|
||||||
declare desc="executes git-upload-pack"
|
declare desc="executes git-upload-pack"
|
||||||
local cmd="git-upload-pack"
|
declare cmd="git-upload-pack"
|
||||||
local APP="$(echo "$2" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g')"
|
declare APP="$2"
|
||||||
|
APP="$(echo "$APP" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g' | sed 's/^\///g')"
|
||||||
is_valid_app_name "$APP"
|
is_valid_app_name "$APP"
|
||||||
plugn trigger git-pre-pull "$APP"
|
plugn trigger git-pre-pull "$APP"
|
||||||
cat | git-upload-pack "$DOKKU_ROOT/$APP"
|
cat | git-upload-pack "$DOKKU_ROOT/$APP"
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ func reportSingleApp(appName, infoFlag string) {
|
|||||||
common.LogFail(fmt.Sprintf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", ")))
|
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() {
|
func main() {
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
appName := flag.Arg(1)
|
appName := flag.Arg(1)
|
||||||
|
|||||||
Reference in New Issue
Block a user