Merge remote-tracking branch 'origin/master' into cn

* origin/master: (333 commits)
  chore(deps): bump gunicorn in /tests/apps/dockerfile-release
  chore(deps): bump importlib-metadata in /docs/_build
  chore(deps): bump soupsieve from 4.0.1 to 4.1 in /docs/_build
  chore(deps): bump gunicorn from 26.2.0 to 27.0.0 in /tests/apps/multi
  chore(deps): bump gunicorn in /tests/apps/python-flask
  chore: bump pack to 0.40.11
  chore(deps): bump pymdown-extensions from 12.3 to 13.0 in /docs/_build
  chore(deps): bump rack
  chore(deps): bump sass from 1.108.0 to 1.108.1 in /tests/apps/multi
  chore(deps): bump mkdocs-material from 9.8.0 to 9.8.1 in /docs/_build
  chore(deps): bump click from 8.5.0 to 8.5.1 in /docs/_build
  chore(deps): bump github.com/dokku/dokku-datastore in /plugins/datastore
  chore(deps): bump golang.org/x/sync in /plugins/common
  chore(deps): bump sass from 1.107.1 to 1.108.0 in /tests/apps/multi
  chore(deps): update markdown requirement in /docs/_build
  chore(deps): bump watchdog from 7.0.0 to 7.1.0 in /docs/_build
  chore(deps): bump soupsieve from 3.0.4 to 4.0.1 in /docs/_build
  chore(deps): bump traefik in /plugins/traefik-vhosts
  fix: build plugins/common on windows
  chore: bump herokuish to 0.11.25
  ...

# Conflicts:
#	common.mk
#	contrib/dependencies.json
This commit is contained in:
apple
2026-11-14 13:14:20 +08:00
572 changed files with 25871 additions and 4931 deletions

View File

@@ -35,8 +35,8 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
DOKKU_GIT_REV=${DOKKU_GIT_REV} \
IS_RELEASE=${IS_RELEASE} \
SKIP_GO_CLEAN=true \
make version copyfiles \
&& make deb-dokku
GOARCH=amd64 make version copyfiles \
&& DOKKU_ARCHITECTURE=amd64 GOARCH=amd64 make deb-dokku
FROM builder AS arm64

View File

@@ -1,11 +1,19 @@
{
"dependencies": [
{
"name": "docker-container-healthchecker",
"version": "0.16.0",
"name": "coredns-docker",
"version": "0.8.0",
"urls": {
"amd64": "https://hub.diyla.com/https://github.com/dokku/docker-container-healthchecker/releases/download/v0.16.0/docker-container-healthchecker-linux-amd64",
"arm64": "https://hub.diyla.com/https://github.com/dokku/docker-container-healthchecker/releases/download/v0.16.0/docker-container-healthchecker-linux-arm64"
"amd64": "https://hub.diyla.com/https://github.com/dokku/coredns-docker/releases/download/0.8.0/coredns-docker-linux-amd64",
"arm64": "https://hub.diyla.com/https://github.com/dokku/coredns-docker/releases/download/0.8.0/coredns-docker-linux-arm64"
}
},
{
"name": "docker-container-healthchecker",
"version": "0.16.1",
"urls": {
"amd64": "https://hub.diyla.com/https://github.com/dokku/docker-container-healthchecker/releases/download/v0.16.1/docker-container-healthchecker-linux-amd64",
"arm64": "https://hub.diyla.com/https://github.com/dokku/docker-container-healthchecker/releases/download/v0.16.1/docker-container-healthchecker-linux-arm64"
}
},
{
@@ -34,18 +42,18 @@
},
{
"name": "pack",
"version": "0.40.9",
"version": "0.40.11",
"urls": {
"amd64": "https://hub.diyla.com/https://github.com/buildpacks/pack/releases/download/v0.40.9/pack-v0.40.9-linux.tgz",
"arm64": "https://hub.diyla.com/https://github.com/buildpacks/pack/releases/download/v0.40.9/pack-v0.40.9-linux-arm64.tgz"
"amd64": "https://hub.diyla.com/https://github.com/buildpacks/pack/releases/download/v0.40.11/pack-v0.40.11-linux.tgz",
"arm64": "https://hub.diyla.com/https://github.com/buildpacks/pack/releases/download/v0.40.11/pack-v0.40.11-linux-arm64.tgz"
}
},
{
"name": "procfile-util",
"version": "0.20.8",
"version": "0.20.9",
"urls": {
"amd64": "https://hub.diyla.com/https://github.com/dokku/procfile-util/releases/download/v0.20.8/procfile-util-linux-amd64",
"arm64": "https://hub.diyla.com/https://github.com/dokku/procfile-util/releases/download/v0.20.8/procfile-util-linux-arm64"
"amd64": "https://hub.diyla.com/https://github.com/dokku/procfile-util/releases/download/v0.20.9/procfile-util-linux-amd64",
"arm64": "https://hub.diyla.com/https://github.com/dokku/procfile-util/releases/download/v0.20.9/procfile-util-linux-arm64"
}
},
{
@@ -86,18 +94,18 @@
},
{
"name": "dokku-update",
"version": "0.10.0",
"version": "0.11.0",
"urls": {
"amd64": "https://hub.diyla.com/https://github.com/dokku/dokku-update/releases/download/v0.10.0/dokku-update",
"arm64": "https://hub.diyla.com/https://github.com/dokku/dokku-update/releases/download/v0.10.0/dokku-update"
"amd64": "https://hub.diyla.com/https://github.com/dokku/dokku-update/releases/download/v0.11.0/dokku-update",
"arm64": "https://hub.diyla.com/https://github.com/dokku/dokku-update/releases/download/v0.11.0/dokku-update"
}
},
{
"name": "herokuish",
"version": "0.11.16",
"version": "0.11.25",
"urls": {
"amd64": "https://hub.diyla.com/https://github.com/gliderlabs/herokuish/releases/download/v0.11.16/herokuish_0.11.16_linux_x86_64.tgz",
"arm64": "https://hub.diyla.com/https://github.com/gliderlabs/herokuish/releases/download/v0.11.16/herokuish_0.11.16_linux_x86_64.tgz"
"amd64": "https://hub.diyla.com/https://github.com/gliderlabs/herokuish/releases/download/v0.11.25/herokuish_0.11.25_linux_x86_64.tgz",
"arm64": "https://hub.diyla.com/https://github.com/gliderlabs/herokuish/releases/download/v0.11.25/herokuish_0.11.25_linux_x86_64.tgz"
}
}
]

View File

@@ -144,7 +144,7 @@ fn-publish-package() {
fi
done
elif [[ "$DIST" == "ubuntu" ]]; then
OS_IDS=("jammy" "noble")
OS_IDS=("jammy" "noble" "resolute")
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"