Skip to content

Commit 7596273

Browse files
duanhongyiduanhongyi
committed
chore(builder): bump golang 1.22
1 parent c337fb6 commit 7596273

19 files changed

Lines changed: 149 additions & 533 deletions

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ DRYCC_REGISTRY ?= ${DEV_REGISTRY}
66
# container development environment variables
77
REPO_PATH := github.com/drycc/${SHORT_NAME}
88
DEV_ENV_IMAGE := ${DEV_REGISTRY}/drycc/go-dev
9-
DEV_ENV_WORK_DIR := /opt/drycc/go/src/${REPO_PATH}
9+
DEV_ENV_WORK_DIR := /root/go/src/${REPO_PATH}
1010
DEV_ENV_PREFIX := podman run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} --entrypoint testdata/bin/fake-k8s
1111
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
1212
PLATFORM ?= linux/amd64,linux/arm64

‎boot.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"fmt"
56
"log"
67
"os"
@@ -45,7 +46,7 @@ func main() {
4546
Name: "server",
4647
Aliases: []string{"srv"},
4748
Usage: "Run the git server",
48-
Action: func(c *cli.Context) error {
49+
Action: func(*cli.Context) error {
4950
cnf := new(sshd.Config)
5051
if err := envconfig.Process(serverConfAppName, cnf); err != nil {
5152
return fmt.Errorf("getting config for %s [%s]", serverConfAppName, err)
@@ -60,7 +61,7 @@ func main() {
6061
return fmt.Errorf("error getting storage parameters (%s)", err)
6162
}
6263
var storageDriver storagedriver.StorageDriver
63-
storageDriver, err = factory.Create("s3", storageParams)
64+
storageDriver, err = factory.Create(context.Background(), "s3", storageParams)
6465

6566
if err != nil {
6667
return fmt.Errorf("error creating storage driver (%s)", err)
@@ -105,7 +106,7 @@ func main() {
105106
Name: "git-receive",
106107
Aliases: []string{"gr"},
107108
Usage: "Run the git-receive hook",
108-
Action: func(c *cli.Context) error {
109+
Action: func(*cli.Context) error {
109110
cnf := new(gitreceive.Config)
110111
if err := envconfig.Process(gitReceiveConfAppName, cnf); err != nil {
111112
return fmt.Errorf("error getting config for %s [%s]", gitReceiveConfAppName, err)
@@ -117,7 +118,7 @@ func main() {
117118
return fmt.Errorf("error getting storage parameters (%s)", err)
118119
}
119120
var storageDriver storagedriver.StorageDriver
120-
storageDriver, err = factory.Create("s3", storageParams)
121+
storageDriver, err = factory.Create(context.Background(), "s3", storageParams)
121122

122123
if err != nil {
123124
return fmt.Errorf("error creating storage driver (%s)", err)

‎go.mod‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
module github.com/drycc/builder
22

3-
go 1.20
3+
go 1.22
44

55
require (
6-
github.com/aws/aws-sdk-go v1.44.299
7-
github.com/distribution/distribution/v3 v3.0.0-20230711080520-40ef2353fa4f
8-
github.com/drycc/controller-sdk-go v0.0.0-20230711045631-016fac5b12ba
9-
github.com/drycc/pkg v0.0.0-20230619083908-711ad2e9f1b8
6+
github.com/aws/aws-sdk-go v1.50.25
7+
github.com/distribution/distribution/v3 v3.0.0-alpha.1.0.20240215070122-62aa44edfde0
8+
github.com/drycc/controller-sdk-go v0.0.0-20240222015357-c385680d03cd
9+
github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f
10+
github.com/google/uuid v1.6.0
1011
github.com/kelseyhightower/envconfig v1.4.0
11-
github.com/pborman/uuid v1.2.1
1212
github.com/stretchr/testify v1.8.4
13-
github.com/urfave/cli/v2 v2.25.7
14-
golang.org/x/crypto v0.14.0
13+
github.com/urfave/cli/v2 v2.27.1
14+
golang.org/x/crypto v0.19.0
1515
gopkg.in/yaml.v3 v3.0.1
16-
k8s.io/api v0.27.3
17-
k8s.io/apimachinery v0.27.3
18-
k8s.io/client-go v0.27.3
16+
k8s.io/api v0.29.2
17+
k8s.io/apimachinery v0.29.2
18+
k8s.io/client-go v0.29.2
1919
)
2020

2121
require (
@@ -24,48 +24,47 @@ require (
2424
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
2525
github.com/davecgh/go-spew v1.1.1 // indirect
2626
github.com/docker/go-metrics v0.0.1 // indirect
27-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
28-
github.com/go-logr/logr v1.2.3 // indirect
27+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
28+
github.com/go-logr/logr v1.3.0 // indirect
2929
github.com/go-openapi/jsonpointer v0.19.6 // indirect
30-
github.com/go-openapi/jsonreference v0.20.1 // indirect
30+
github.com/go-openapi/jsonreference v0.20.2 // indirect
3131
github.com/go-openapi/swag v0.22.3 // indirect
3232
github.com/gogo/protobuf v1.3.2 // indirect
3333
github.com/golang/protobuf v1.5.3 // indirect
34-
github.com/google/gnostic v0.5.7-v3refs // indirect
35-
github.com/google/go-cmp v0.5.9 // indirect
36-
github.com/google/gofuzz v1.1.0 // indirect
37-
github.com/google/uuid v1.3.0 // indirect
38-
github.com/gorilla/mux v1.8.0 // indirect
34+
github.com/google/gnostic-models v0.6.8 // indirect
35+
github.com/google/go-cmp v0.6.0 // indirect
36+
github.com/google/gofuzz v1.2.0 // indirect
37+
github.com/gorilla/mux v1.8.1 // indirect
3938
github.com/jmespath/go-jmespath v0.4.0 // indirect
4039
github.com/josharian/intern v1.0.0 // indirect
4140
github.com/json-iterator/go v1.1.12 // indirect
4241
github.com/mailru/easyjson v0.7.7 // indirect
43-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
42+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4443
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4544
github.com/modern-go/reflect2 v1.0.2 // indirect
4645
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4746
github.com/pmezard/go-difflib v1.0.0 // indirect
48-
github.com/prometheus/client_golang v1.12.1 // indirect
49-
github.com/prometheus/client_model v0.2.0 // indirect
50-
github.com/prometheus/common v0.32.1 // indirect
51-
github.com/prometheus/procfs v0.7.3 // indirect
47+
github.com/prometheus/client_golang v1.17.0 // indirect
48+
github.com/prometheus/client_model v0.5.0 // indirect
49+
github.com/prometheus/common v0.44.0 // indirect
50+
github.com/prometheus/procfs v0.11.1 // indirect
5251
github.com/russross/blackfriday/v2 v2.1.0 // indirect
53-
github.com/sirupsen/logrus v1.8.1 // indirect
52+
github.com/sirupsen/logrus v1.9.3 // indirect
5453
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
55-
golang.org/x/net v0.17.0 // indirect
56-
golang.org/x/oauth2 v0.6.0 // indirect
57-
golang.org/x/sys v0.13.0 // indirect
58-
golang.org/x/term v0.13.0 // indirect
59-
golang.org/x/text v0.13.0 // indirect
60-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
54+
golang.org/x/net v0.21.0 // indirect
55+
golang.org/x/oauth2 v0.11.0 // indirect
56+
golang.org/x/sys v0.17.0 // indirect
57+
golang.org/x/term v0.17.0 // indirect
58+
golang.org/x/text v0.14.0 // indirect
59+
golang.org/x/time v0.3.0 // indirect
6160
google.golang.org/appengine v1.6.7 // indirect
62-
google.golang.org/protobuf v1.29.1 // indirect
61+
google.golang.org/protobuf v1.31.0 // indirect
6362
gopkg.in/inf.v0 v0.9.1 // indirect
6463
gopkg.in/yaml.v2 v2.4.0 // indirect
65-
k8s.io/klog/v2 v2.90.1 // indirect
66-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
67-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
64+
k8s.io/klog/v2 v2.110.1 // indirect
65+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
66+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
6867
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
69-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
68+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7069
sigs.k8s.io/yaml v1.3.0 // indirect
7170
)

0 commit comments

Comments
 (0)