这是indexloc提供的服务，不要输入任何密码
Skip to content

Add support for Debian Trixie #7937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 7, 2025
Merged

Add support for Debian Trixie #7937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ set -eo pipefail
# That's good because it prevents our output overlapping with wget's.
# It also means that we can't run a partially downloaded script.

SUPPORTED_VERSIONS="Debian [11, 12], Ubuntu [22.04, 24.04]"
SUPPORTED_VERSIONS="Debian [11, 12, 13], Ubuntu [22.04, 24.04]"

log-fail() {
declare desc="log fail formatter"
Expand Down Expand Up @@ -48,9 +48,11 @@ install-requirements() {
apt-get update -qq >/dev/null
apt-get -qq -y --no-install-recommends install gpg-agent
fi
if ! dpkg -l | grep -q software-properties-common; then
apt-get update -qq >/dev/null
apt-get -qq -y --no-install-recommends install software-properties-common
if [[ "$DOKKU_DISTRO_VERSION" -lt "13" ]]; then
if ! dpkg -l | grep -q software-properties-common; then
apt-get update -qq >/dev/null
apt-get -qq -y --no-install-recommends install software-properties-common
fi
fi
;;
ubuntu)
Expand Down Expand Up @@ -160,7 +162,7 @@ install-dokku-from-deb-package() {
local NO_INSTALL_RECOMMENDS=${DOKKU_NO_INSTALL_RECOMMENDS:=""}
local OS_ID

if ! in-array "$DOKKU_DISTRO_VERSION" "22.04" "24.04" "10" "11" "12"; then
if ! in-array "$DOKKU_DISTRO_VERSION" "22.04" "24.04" "10" "11" "12" "13"; then
log-fail "Unsupported Linux distribution. Only the following versions are supported: $SUPPORTED_VERSIONS"
fi

Expand Down Expand Up @@ -193,12 +195,12 @@ install-dokku-from-deb-package() {
OS_ID="noble"
fi
elif [[ "$DOKKU_DISTRO" == "debian" ]]; then
OS_IDS=("bullseye" "bookworm")
OS_IDS=("bullseye" "bookworm" "trixie")
if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
OS_ID="bookworm"
fi
elif [[ "$DOKKU_DISTRO" == "raspbian" ]]; then
OS_IDS=("bullseye" "bookworm")
OS_IDS=("bullseye" "bookworm" "trixie")
if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
OS_ID="bookworm"
fi
Expand Down
4 changes: 2 additions & 2 deletions contrib/release-dokku
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ fn-publish-package() {
[[ "$RELEASE_TYPE" == "raspbian" ]] && DIST=raspbian

if [[ "$RELEASE_TYPE" == "raspbian" ]]; then
OS_IDS=("bullseye" "bookworm")
OS_IDS=("bullseye" "bookworm" "trixie")
for OS_ID in "${OS_IDS[@]}"; do
log-info "(release-dokku) pushing deb to packagecloud.com/${REPOSITORY}/${DIST}"
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
Expand All @@ -155,7 +155,7 @@ fn-publish-package() {
done

DIST=debian
OS_IDS=("bullseye" "bookworm")
OS_IDS=("bullseye" "bookworm" "trixie")
for OS_ID in "${OS_IDS[@]}"; do
log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
Expand Down
Loading