Merge pull request #6768 from dokku/remove-transitional-packages

Migrate away from transitional packages
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2024-03-26 18:36:30 -04:00
commit 580ce20d77
7 files changed
+3 -34

No files matched your search

-4
View File
@@ -168,10 +168,6 @@ install-dokku-from-deb-package() {
NO_INSTALL_RECOMMENDS=" --no-install-recommends " NO_INSTALL_RECOMMENDS=" --no-install-recommends "
fi fi
echo "--> Initial apt-get update"
apt-get update -qq >/dev/null
apt-get -qq -y --no-install-recommends install apt-transport-https
if ! command -v docker &>/dev/null; then if ! command -v docker &>/dev/null; then
echo "--> Installing docker" echo "--> Installing docker"
if uname -r | grep -q linode; then if uname -r | grep -q linode; then
@@ -4,8 +4,7 @@ set -o errexit
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
pkgs=(apt-transport-https pkgs=(ca-certificates
ca-certificates
curl curl
jq jq
linux-image-extra-virtual linux-image-extra-virtual
@@ -24,7 +24,7 @@ pkgs=(apache2-utils
unzip unzip
nginx nginx
dnsutils bind9-dnsutils
cgroupfs-mount cgroupfs-mount
cgroup-lite cgroup-lite
sudo sudo
-4
View File
@@ -11,10 +11,6 @@ endif
.PHONY: install-from-deb deb-all deb-dokku deb-setup .PHONY: install-from-deb deb-all deb-dokku deb-setup
install-from-deb: install-from-deb:
@echo "--> Initial apt-get update"
sudo apt-get update -qq >/dev/null
sudo apt-get -qq -y --no-install-recommends install apt-transport-https
@echo "--> Installing docker" @echo "--> Installing docker"
wget -nv -O - https://get.docker.com/ | sh wget -nv -O - https://get.docker.com/ | sh
+1 -1
View File
@@ -5,7 +5,7 @@ Priority: optional
Architecture: amd64 Architecture: amd64
Depends: apache2-utils, locales, git, cpio, curl, man-db, netcat, sshcommand, docker-engine-cs (>= 17.05.0) | docker-engine (>= 17.05.0) | docker-io (>= 17.05.0) | docker.io (>= 17.05.0) | docker-ce (>= 17.05.0) | docker-ee (>= 17.05.0) | moby-engine, docker-compose-plugin | moby-compose, docker-buildx-plugin | moby-buildx, docker-container-healthchecker, docker-image-labeler, lambda-builder, net-tools, netrc, parallel, procfile-util, rsync, rsyslog, dos2unix, jq, unzip, util-linux Depends: apache2-utils, locales, git, cpio, curl, man-db, netcat, sshcommand, docker-engine-cs (>= 17.05.0) | docker-engine (>= 17.05.0) | docker-io (>= 17.05.0) | docker.io (>= 17.05.0) | docker-ce (>= 17.05.0) | docker-ee (>= 17.05.0) | moby-engine, docker-compose-plugin | moby-compose, docker-buildx-plugin | moby-buildx, docker-container-healthchecker, docker-image-labeler, lambda-builder, net-tools, netrc, parallel, procfile-util, rsync, rsyslog, dos2unix, jq, unzip, util-linux
Recommends: herokuish, bash-completion, dokku-update, dokku-event-listener Recommends: herokuish, bash-completion, dokku-update, dokku-event-listener
Pre-Depends: gliderlabs-sigil, nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn, sudo, python3, debconf Pre-Depends: gliderlabs-sigil, nginx (>= 1.8.0) | openresty, bind9-dnsutils, cgroupfs-mount | cgroup-lite, plugn, sudo, python3, debconf
Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com> Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
Description: Docker-powered PaaS that helps build and manage the lifecycle of applications Description: Docker-powered PaaS that helps build and manage the lifecycle of applications
Dokku is an extensible, open source Platform as a Service Dokku is an extensible, open source Platform as a Service
-4
View File
@@ -3,10 +3,6 @@
As of 0.3.18, Dokku defaults to being installed via Debian package. While certain hosts may require extra work to get running, you may optionally wish to automate the installation of Dokku without the use of our `bootstrap.sh` Bash script. The following are the steps run by said script: As of 0.3.18, Dokku defaults to being installed via Debian package. While certain hosts may require extra work to get running, you may optionally wish to automate the installation of Dokku without the use of our `bootstrap.sh` Bash script. The following are the steps run by said script:
```shell ```shell
# install prerequisites
sudo apt-get update -qq >/dev/null
sudo apt-get -qq -y --no-install-recommends install apt-transport-https
# install docker # install docker
wget -nv -O - https://get.docker.com/ | sh wget -nv -O - https://get.docker.com/ | sh
-18
View File
@@ -2,29 +2,11 @@
set -eo pipefail set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x [[ $DOKKU_TRACE ]] && set -x
nginx_install() {
declare desc="install nginx and dnsutils"
export DEBIAN_FRONTEND=noninteractive
apt-get -qq -y --no-install-recommends install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" nginx dnsutils
}
trigger-nginx-vhosts-dependencies() { trigger-nginx-vhosts-dependencies() {
declare desc="installs dependencies for the nginx-vhosts plugin" declare desc="installs dependencies for the nginx-vhosts plugin"
declare trigger="dependencies" declare trigger="dependencies"
case "$DOKKU_DISTRO" in case "$DOKKU_DISTRO" in
debian | raspbian)
nginx_install
;;
ubuntu)
if command -v nginx &>/dev/null; then
return
fi
nginx_install
;;
arch) arch)
pacman -S --noconfirm --noprogressbar --needed nginx bind-tools pacman -S --noconfirm --noprogressbar --needed nginx bind-tools
;; ;;