Merge branch 'master' into cn

# Conflicts:
#	common.mk
#	contrib/dependencies.json
This commit is contained in:
apple
2025-10-09 11:40:06 +08:00
340 changed files with 5770 additions and 2818 deletions

View File

@@ -1,7 +1,7 @@
GO_ARGS ?=
GO_PLUGIN_MAKE_TARGET ?= build
GO_REPO_ROOT := /go/src/github.com/dokku/dokku
BUILD_IMAGE := ccr.ccs.tencentyun.com/miaogai/golang:1.23.0
BUILD_IMAGE := ccr.ccs.tencentyun.com/miaogai/golang:1.25.1
GO_BUILD_CACHE ?= /tmp/dokku-go-build-cache
GO_MOD_CACHE ?= /tmp/dokku-go-mod-mod
GO_ROOT_MOUNT ?= $$PWD/../..:$(GO_REPO_ROOT)