这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion common.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GO_ARGS ?=
GO_PLUGIN_MAKE_TARGET ?= build
GO_REPO_ROOT := /go/src/github.com/dokku/dokku
BUILD_IMAGE := golang:1.24.5
BUILD_IMAGE := 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)
Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.24.5
go 1.25.1

use (
./plugins/app-json
Expand Down
2 changes: 1 addition & 1 deletion plugins/app-json/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/app-json

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/apps/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/apps

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/builder/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/builder

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/buildpacks/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/buildpacks

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/common/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/common

go 1.24.5
go 1.25.1

require (
github.com/alexellis/go-execute/v2 v2.2.1
Expand Down
2 changes: 1 addition & 1 deletion plugins/config/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/config

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/cron/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/cron

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/app-json v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/docker-options/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/docker-options

go 1.24.5
go 1.25.1

require github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000

Expand Down
2 changes: 1 addition & 1 deletion plugins/logs/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/logs

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/network/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/network

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/nginx-vhosts/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/nginx-vhosts

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/ports/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/ports

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/proxy/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/proxy

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/ps/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/ps

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/registry/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/registry

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/repo/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/repo

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/resource/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/resource

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion plugins/scheduler-docker-local/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/scheduler-docker-local

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
14 changes: 7 additions & 7 deletions plugins/scheduler-k3s/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/scheduler-k3s

go 1.24.5
go 1.25.1

require (
github.com/cert-manager/cert-manager v1.18.2
Expand All @@ -11,7 +11,7 @@ require (
github.com/dokku/dokku/plugins/logs v0.0.0-20250618161309-8d0c35f1333c
github.com/dokku/dokku/plugins/nginx-vhosts v0.0.0-20250618161309-8d0c35f1333c
github.com/fatih/color v1.18.0
github.com/fluxcd/pkg/kustomize v1.19.0
github.com/fluxcd/pkg/kustomize v1.22.0
github.com/go-openapi/jsonpointer v0.22.0
github.com/go-resty/resty/v2 v2.16.5
github.com/gofrs/flock v0.12.1
Expand Down Expand Up @@ -125,7 +125,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/sftp v1.13.9 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.22.0 // indirect
github.com/prometheus/client_golang v1.23.0 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.65.0 // indirect
github.com/prometheus/procfs v0.17.0 // indirect
Expand Down Expand Up @@ -156,18 +156,18 @@ require (
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
google.golang.org/grpc v1.73.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
google.golang.org/protobuf v1.36.7 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/apiextensions-apiserver v0.33.3 // indirect
k8s.io/apiserver v0.33.3 // indirect
k8s.io/apiextensions-apiserver v0.34.0 // indirect
k8s.io/apiserver v0.34.0 // indirect
k8s.io/cli-runtime v0.34.0 // indirect
k8s.io/component-base v0.34.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
knative.dev/pkg v0.0.0-20250708013613-d3550d4350f9 // indirect
oras.land/oras-go/v2 v2.6.0 // indirect
sigs.k8s.io/controller-runtime v0.21.0 // indirect
sigs.k8s.io/controller-runtime v0.22.1 // indirect
sigs.k8s.io/gateway-api v1.3.0 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
Expand Down
25 changes: 12 additions & 13 deletions plugins/scheduler-k3s/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/fluxcd/pkg/kustomize v1.19.0 h1:2eO8lMx0/H/Yyq35LMTAMhxEElOzMW0Yi9zUNZoimlU=
github.com/fluxcd/pkg/kustomize v1.19.0/go.mod h1:OCCW9vU3lStDh3jyg9MM/a29MSdNAVk2wjl0lDos5Fs=
github.com/fluxcd/pkg/kustomize v1.22.0 h1:g+eMeKgBMBpvG15rk9v3r8Ixv5wOv9cDNqB1dJ5J9Ks=
github.com/fluxcd/pkg/kustomize v1.22.0/go.mod h1:gFtHV+467sU0pUnxuVhb8UiOmz/LOPJy77QoZL3mHso=
github.com/foxcpp/go-mockdns v1.1.0 h1:jI0rD8M0wuYAxL7r/ynTrCQQq0BVqfB99Vgk7DlmewI=
github.com/foxcpp/go-mockdns v1.1.0/go.mod h1:IhLeSFGed3mJIAXPH2aiRQB+kqz7oqu8ld2qVbOu7Wk=
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
Expand Down Expand Up @@ -168,7 +168,6 @@ github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY=
github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
Expand Down Expand Up @@ -287,8 +286,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
Expand Down Expand Up @@ -527,8 +526,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 h1:
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
Expand All @@ -547,12 +546,12 @@ helm.sh/helm/v3 v3.18.6 h1:S/2CqcYnNfLckkHLI0VgQbxgcDaU3N4A/46E3n9wSNY=
helm.sh/helm/v3 v3.18.6/go.mod h1:L/dXDR2r539oPlFP1PJqKAC1CUgqHJDLkxKpDGrWnyg=
k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
k8s.io/apiextensions-apiserver v0.33.3 h1:qmOcAHN6DjfD0v9kxL5udB27SRP6SG/MTopmge3MwEs=
k8s.io/apiextensions-apiserver v0.33.3/go.mod h1:oROuctgo27mUsyp9+Obahos6CWcMISSAPzQ77CAQGz8=
k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc=
k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0=
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
k8s.io/apiserver v0.33.3 h1:Wv0hGc+QFdMJB4ZSiHrCgN3zL3QRatu56+rpccKC3J4=
k8s.io/apiserver v0.33.3/go.mod h1:05632ifFEe6TxwjdAIrwINHWE2hLwyADFk5mBsQa15E=
k8s.io/apiserver v0.34.0 h1:Z51fw1iGMqN7uJ1kEaynf2Aec1Y774PqU+FVWCFV3Jg=
k8s.io/apiserver v0.34.0/go.mod h1:52ti5YhxAvewmmpVRqlASvaqxt0gKJxvCeW7ZrwgazQ=
k8s.io/cli-runtime v0.34.0 h1:N2/rUlJg6TMEBgtQ3SDRJwa8XyKUizwjlOknT1mB2Cw=
k8s.io/cli-runtime v0.34.0/go.mod h1:t/skRecS73Piv+J+FmWIQA2N2/rDjdYSQzEE67LUUs8=
k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo=
Expand All @@ -575,8 +574,8 @@ mvdan.cc/sh/v3 v3.12.0 h1:ejKUR7ONP5bb+UGHGEG/k9V5+pRVIyD+LsZz7o8KHrI=
mvdan.cc/sh/v3 v3.12.0/go.mod h1:Se6Cj17eYSn+sNooLZiEUnNNmNxg0imoYlTu4CyaGyg=
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
sigs.k8s.io/controller-runtime v0.22.1 h1:Ah1T7I+0A7ize291nJZdS1CabF/lB4E++WizgV24Eqg=
sigs.k8s.io/controller-runtime v0.22.1/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
sigs.k8s.io/gateway-api v1.3.0 h1:q6okN+/UKDATola4JY7zXzx40WO4VISk7i9DIfOvr9M=
sigs.k8s.io/gateway-api v1.3.0/go.mod h1:d8NV8nJbaRbEKem+5IuxkL8gJGOZ+FJ+NvOIltV8gDk=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
Expand Down
2 changes: 1 addition & 1 deletion plugins/scheduler/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/scheduler

go 1.24.5
go 1.25.1

require (
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
Expand Down
4 changes: 1 addition & 3 deletions tests/apps/gogrpc/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/dokku/dokko/tests/apps/gorpc

go 1.23.2

toolchain go1.24.1
go 1.25.1

require (
golang.org/x/net v0.41.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion tests/apps/zombies-buildpack/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module dokku.me/web

go 1.23.2
go 1.25.1
2 changes: 1 addition & 1 deletion tests/apps/zombies-dockerfile-no-tini/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module dokku.me/web

go 1.23.2
go 1.25.1
2 changes: 1 addition & 1 deletion tests/apps/zombies-dockerfile-tini/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module dokku.me/web

go 1.23.2
go 1.25.1
Loading