Merge pull request #3964 from dokku/3949-remove-force-yes
Remove all --force-yes usage throughout the codebase
This commit is contained in:
4 files changed
+9
-9
No files matched your search
@@ -81,7 +81,7 @@ main() {
|
|||||||
;;
|
;;
|
||||||
debian | ubuntu)
|
debian | ubuntu)
|
||||||
apt-get update -qq >/dev/null
|
apt-get update -qq >/dev/null
|
||||||
apt-get -qq -y --force-yes dist-upgrade
|
apt-get -qq -y dist-upgrade
|
||||||
;;
|
;;
|
||||||
centos | opensuse | rhel)
|
centos | opensuse | rhel)
|
||||||
dokku-log-warn "Updating this operating system is not supported"
|
dokku-log-warn "Updating this operating system is not supported"
|
||||||
|
|||||||
@@ -327,7 +327,7 @@ export DEBIAN_FRONTEND=noninteractive
|
|||||||
|
|
||||||
case "$DOKKU_DISTRO" in
|
case "$DOKKU_DISTRO" in
|
||||||
debian|ubuntu)
|
debian|ubuntu)
|
||||||
apt-get install --force-yes -qq -y nginx
|
apt-get install -qq -y nginx
|
||||||
;;
|
;;
|
||||||
|
|
||||||
opensuse)
|
opensuse)
|
||||||
|
|||||||
@@ -2,31 +2,31 @@
|
|||||||
|
|
||||||
While we hate to see you go, if you need to uninstall Dokku, the following may help you out:
|
While we hate to see you go, if you need to uninstall Dokku, the following may help you out:
|
||||||
|
|
||||||
## Arch Installation
|
## Arch Uninstallation
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
# purge dokku from your system
|
# purge dokku from your system
|
||||||
yaourt -Rsn dokku
|
yaourt -Rsn dokku
|
||||||
```
|
```
|
||||||
|
|
||||||
## CentOS Installation
|
## CentOS Uninstallation
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
# uninstall dokku
|
# uninstall dokku
|
||||||
yum remove dokku herokuish
|
yum remove dokku herokuish
|
||||||
```
|
```
|
||||||
|
|
||||||
## Debian Installation
|
## Debian Uninstallation
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
# purge dokku from your system
|
# purge dokku from your system
|
||||||
apt-get purge -y --force-yes dokku herokuish
|
apt-get purge dokku herokuish
|
||||||
|
|
||||||
# remove any dependencies that are no longer necessary
|
# remove any dependencies that are no longer necessary
|
||||||
apt-get -y --force-yes autoremove
|
apt-get autoremove
|
||||||
```
|
```
|
||||||
|
|
||||||
## Makefile Installation
|
## Makefile Uninstallation
|
||||||
|
|
||||||
This is a manual deletion process, and as it is not a recommended installation method, there is currently no automated uninstallation.
|
This is a manual deletion process, and as it is not a recommended installation method, there is currently no automated uninstallation.
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ nginx_needs_upgrade() {
|
|||||||
nginx_install() {
|
nginx_install() {
|
||||||
declare desc="install nginx and dnsutils"
|
declare desc="install nginx and dnsutils"
|
||||||
export DEBIAN_FRONTEND=noninteractive
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes -qq -y nginx dnsutils
|
apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -qq -y nginx dnsutils
|
||||||
}
|
}
|
||||||
|
|
||||||
trigger-nginx-vhosts-dependencies() {
|
trigger-nginx-vhosts-dependencies() {
|
||||||
|
|||||||
Reference in new issue
Block a user