github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into cn

Browse Source 
# Conflicts:
#	common.mk
#	contrib/dependencies.json
This commit is contained in:
apple
2025-10-09 11:40:06 +08:00
parent ba8e522ff8 0092c28e74
commit 69eee39904
340 changed files with 5770 additions and 2818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
contrib/dependencies.json
View File

@@ -2,94 +2,94 @@
"dependencies": [
{
"name": "docker-container-healthchecker",
"version": "0.11.0",
"version": "0.14.0",
"urls": {
"amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/docker-container-healthchecker-linux-amd64",
"arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/docker-container-healthchecker-linux-arm64"
"amd64": "https://gh-proxy.com/https://github.com/dokku/docker-container-healthchecker/releases/download/v0.14.0/docker-container-healthchecker-linux-amd64",
"arm64": "https://gh-proxy.com/https://github.com/dokku/docker-container-healthchecker/releases/download/v0.14.0/docker-container-healthchecker-linux-arm64"
}
},
{
"name": "docker-image-labeler",
"version": "0.8.0",
"version": "0.8.1",
"urls": {
"amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/docker-image-labeler-linux-amd64",
"arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/docker-image-labeler-linux-arm64"
"amd64": "https://gh-proxy.com/https://github.com/dokku/docker-image-labeler/releases/download/v0.8.1/docker-image-labeler-linux-amd64",
"arm64": "https://gh-proxy.com/https://github.com/dokku/docker-image-labeler/releases/download/v0.8.1/docker-image-labeler-linux-arm64"
}
},
{
"name": "lambda-builder",
"version": "0.8.0",
"version": "0.9.1",
"urls": {
"amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/lambda-builder-linux-amd64",
"arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/lambda-builder-linux-arm64"
"amd64": "https://gh-proxy.com/https://github.com/dokku/lambda-builder/releases/download/v0.9.1/lambda-builder-linux-amd64",
"arm64": "https://gh-proxy.com/https://github.com/dokku/lambda-builder/releases/download/v0.9.1/lambda-builder-linux-arm64"
}
},
{
"name": "netrc",
"version": "0.10.0",
"version": "0.10.2",
"urls": {
"amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/netrc-linux-amd64",
"arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/netrc-linux-arm64"
"amd64": "https://gh-proxy.com/https://github.com/dokku/netrc/releases/download/v0.10.2/netrc-linux-amd64",
"arm64": "https://gh-proxy.com/https://github.com/dokku/netrc/releases/download/v0.10.2/netrc-linux-arm64"
}
},
{
"name": "procfile-util",
"version": "0.19.0",
"version": "0.20.3",
"urls": {
"amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/procfile-util-linux-amd64",
"arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/procfile-util-linux-arm64"
"amd64": "https://gh-proxy.com/https://github.com/dokku/procfile-util/releases/download/v0.20.3/procfile-util-linux-amd64",
"arm64": "https://gh-proxy.com/https://github.com/dokku/procfile-util/releases/download/v0.20.3/procfile-util-linux-arm64"
}
},
{
"name": "sshcommand",
"version": "0.18.0",
"version": "0.20.0",
"urls": {
"amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/sshcommand",
"arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/sshcommand"
"amd64": "https://gh-proxy.com/https://github.com/dokku/sshcommand/releases/download/v0.20.0/sshcommand",
"arm64": "https://gh-proxy.com/https://github.com/dokku/sshcommand/releases/download/v0.20.0/sshcommand"
}
}
],
"predependencies": [
{
"name": "gliderlabs-sigil",
"version": "0.11.0",
"version": "0.11.4",
"urls": {
"amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/sigil-linux-amd64",
"arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/sigil-linux-arm64"
"amd64": "https://gh-proxy.com/https://github.com/gliderlabs/sigil/releases/download/v0.11.4/sigil-linux-amd64",
"arm64": "https://gh-proxy.com/https://github.com/gliderlabs/sigil/releases/download/v0.11.4/sigil-linux-arm64"
}
},
{
"name": "plugn",
"version": "0.15.3",
"version": "0.16.0",
"urls": {
"amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/plugn-linux-amd64",
"arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/plugn-linux-arm64"
"amd64": "https://gh-proxy.com/https://github.com/dokku/plugn/releases/download/v0.16.0/plugn-linux-amd64",
"arm64": "https://gh-proxy.com/https://github.com/dokku/plugn/releases/download/v0.16.0/plugn-linux-arm64"
}
}
],
"recommendations": [
{
"name": "dokku-event-listener",
"version": "0.17.0",
"version": "0.17.2",
"urls": {
"amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/dokku-event-listener-linux-amd64",
"arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/dokku-event-listener-linux-arm64"
"amd64": "https://gh-proxy.com/https://github.com/dokku/dokku-event-listener/releases/download/v0.17.2/dokku-event-listener-linux-amd64",
"arm64": "https://gh-proxy.com/https://github.com/dokku/dokku-event-listener/releases/download/v0.17.2/dokku-event-listener-linux-arm64"
}
},
{
"name": "dokku-update",
"version": "0.9.4",
"version": "0.9.6",
"urls": {
"amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/dokku-update",
"arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/dokku-update"
"amd64": "https://gh-proxy.com/https://github.com/dokku/dokku-update/releases/download/v0.9.6/dokku-update",
"arm64": "https://gh-proxy.com/https://github.com/dokku/dokku-update/releases/download/v0.9.6/dokku-update"
}
},
{
"name": "herokuish",
"version": "0.10.2",
"version": "0.11.3",
"urls": {
"amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/herokuish_0.10.2_linux_x86_64.tgz",
"arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/herokuish_0.10.2_linux_x86_64.tgz"
"amd64": "https://gh-proxy.com/https://github.com/gliderlabs/herokuish/releases/download/v0.11.3/herokuish_0.11.3_linux_x86_64.tgz",
"arm64": "https://gh-proxy.com/https://github.com/gliderlabs/herokuish/releases/download/v0.11.3/herokuish_0.11.3_linux_x86_64.tgz"
}
}
]

2
contrib/images/digitalocean/in_parts/100-image-check
View File

@@ -355,7 +355,7 @@ function checkFirewall {
elif [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]] || [[ $OS == "AlmaLinux" ]]; then
if [ -f /usr/lib/systemd/system/csf.service ]; then
fw="csf"
if [[ $(systemctl status $fw >/dev/null 2>&1) ]]; then
if systemctl status $fw >/dev/null 2>&1; then
FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
((PASS++))

12
contrib/release-dokku
View File

@@ -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"
@@ -144,7 +144,7 @@ fn-publish-package() {
fi
done
elif [[ "$DIST" == "ubuntu" ]]; then
OS_IDS=("focal" "jammy" "noble")
OS_IDS=("jammy" "noble")
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"
@@ -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"
@@ -183,9 +183,9 @@ fn-replace-version() {
fn-repo-merged-requests() {
declare desc="Retrieves all pull request ids since a given release of dokku"
declare TAG="$1" IS_PATCH="$2"
declare CURRENT_VERSION="$1" NEXT_VERSION="$2" IS_PATCH="$3"
if [[ "$IS_PATCH" == "true" ]]; then
git log "v${TAG}..HEAD" --oneline | grep "Merge pull request" | cut -d' ' -f 5 | cut -d '#' -f2
git log "v${CURRENT_VERSION}..HEAD" --oneline | grep "Merge pull request" | cut -d' ' -f 5 | cut -d '#' -f2
else
curl -u "$RELEASE_GITHUB_USERNAME:$RELEASE_GITHUB_API_TOKEN" --fail -sS "https://api.github.com/search/issues?q=repo:dokku/dokku+milestone:v${NEXT_VERSION}+is:pr&per_page=100" | jq '.items[].number'
fi
@@ -256,7 +256,7 @@ fn-repo-update-history-and-commit() {
mkdir -p /tmp/github-data
for PULL_REQUEST_ID in $(fn-repo-merged-requests "$CURRENT_VERSION" "$IS_PATCH"); do
for PULL_REQUEST_ID in $(fn-repo-merged-requests "$CURRENT_VERSION" "$NEXT_VERSION" "$IS_PATCH"); do
ISSUE_FILE="/tmp/github-data/${PULL_REQUEST_ID}.json"
if [[ ! -f "$ISSUE_FILE" ]]; then
while true; do