Skip to content

Commit 2d1d2f0

Browse files
authored
Merge pull request #41 from carolynvs/bump-porter
Bump porter to v1.0.1
2 parents c12d7c8 + 9e882a7 commit 2d1d2f0

File tree

5 files changed

+11
-1515
lines changed

5 files changed

+11
-1515
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
bin
22
.cnab
3-
*-packr.go
43
/docker
54
/docker.exe
65
/build/git_askpass.sh

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pool:
1010
steps:
1111
- task: GoTool@0
1212
inputs:
13-
version: '1.18.6'
13+
version: '1.19.2'
1414
displayName: 'Install Go'
1515

1616
- script: go run mage.go ConfigureAgent

go.mod

+4-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module get.porter.sh/mixin/docker
22

3-
go 1.17
3+
go 1.19
44

55
replace (
66
// These are replace directives copied from porter
@@ -12,10 +12,9 @@ replace (
1212
)
1313

1414
require (
15-
get.porter.sh/magefiles v0.3.2
16-
get.porter.sh/porter v1.0.0-rc.2
15+
get.porter.sh/magefiles v0.3.3
16+
get.porter.sh/porter v1.0.1
1717
github.com/ghodss/yaml v1.0.0
18-
github.com/gobuffalo/packr/v2 v2.8.1
1918
github.com/pkg/errors v0.9.1
2019
github.com/spf13/cobra v1.5.0
2120
github.com/stretchr/testify v1.8.0
@@ -56,8 +55,6 @@ require (
5655
github.com/fsnotify/fsnotify v1.5.4 // indirect
5756
github.com/go-logr/logr v1.2.3 // indirect
5857
github.com/go-logr/stdr v1.2.2 // indirect
59-
github.com/gobuffalo/logger v1.0.4 // indirect
60-
github.com/gobuffalo/packd v1.0.0 // indirect
6158
github.com/goccy/go-yaml v1.9.5 // indirect
6259
github.com/gogo/protobuf v1.3.2 // indirect
6360
github.com/golang/protobuf v1.5.2 // indirect
@@ -72,14 +69,10 @@ require (
7269
github.com/hashicorp/hcl v1.0.0 // indirect
7370
github.com/inconshreveable/mousetrap v1.0.1 // indirect
7471
github.com/jeremywohl/flatten v1.0.1 // indirect
75-
github.com/karrick/godirwalk v1.16.1 // indirect
7672
github.com/klauspost/compress v1.15.10 // indirect
7773
github.com/klauspost/pgzip v1.2.5 // indirect
7874
github.com/magefile/mage v1.14.0 // indirect
7975
github.com/magiconair/properties v1.8.6 // indirect
80-
github.com/markbates/errx v1.1.0 // indirect
81-
github.com/markbates/oncer v1.0.0 // indirect
82-
github.com/markbates/safe v1.0.1 // indirect
8376
github.com/mattn/go-colorable v0.1.13 // indirect
8477
github.com/mattn/go-isatty v0.0.16 // indirect
8578
github.com/mattn/go-runewidth v0.0.14 // indirect
@@ -137,11 +130,10 @@ require (
137130
golang.org/x/net v0.0.0-20220919232410-f2f64ebce3c1 // indirect
138131
golang.org/x/sync v0.0.0-20220907140024-f12130a52804 // indirect
139132
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
140-
golang.org/x/term v0.0.0-20220919170432-7a66f970e087 // indirect
141133
golang.org/x/text v0.3.7 // indirect
142134
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
143135
google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51 // indirect
144-
google.golang.org/grpc v1.49.0 // indirect
136+
google.golang.org/grpc v1.50.0 // indirect
145137
google.golang.org/protobuf v1.28.1 // indirect
146138
gopkg.in/ini.v1 v1.67.0 // indirect
147139
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect

0 commit comments

Comments
 (0)