Skip to content

Commit

Permalink
Merge branch 'main' into depOutputVariable
Browse files Browse the repository at this point in the history
  • Loading branch information
kichristensen authored Jul 13, 2024
2 parents 7865841 + 996c56c commit 70fa454
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 285 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ and we will add you. **All** contributors belong here. 💯
- [Shivam](https://github.com/Bharadwajshivam28)
- [David Gannon](https://github.com/dgannon991)
- [guangwu guo](https://github.com/testwill)
- [Eric Herrmann](https://github.com/egherrmann)
6 changes: 3 additions & 3 deletions docs/content/docs/getting-started/install-porter.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ Set VERSION to the most recent [release] version number.
**MacOS**

```bash
export VERSION="v1.0.14"
export VERSION="v1.1.0"
curl -L https://cdn.porter.sh/$VERSION/install-mac.sh | bash
```

**Linux**

```bash
export VERSION="v1.0.14"
export VERSION="v1.1.0"
curl -L https://cdn.porter.sh/$VERSION/install-linux.sh | bash
```

**Windows**

```powershell
$VERSION="v1.0.14"
$VERSION="v1.1.0"
(New-Object System.Net.WebClient).DownloadFile("https://cdn.porter.sh/$VERSION/install-windows.ps1", "install-porter.ps1")
.\install-porter.ps1
```
Expand Down
2 changes: 1 addition & 1 deletion docs/content/docs/quickstart/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ History:
To upgrade the resources managed by the bundle, use `porter upgrade`.

```console
$ porter upgrade
$ porter upgrade porter-hello
```

```
Expand Down
38 changes: 19 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ replace (
)

require (
get.porter.sh/magefiles v0.6.7
get.porter.sh/magefiles v0.6.8
github.com/Masterminds/semver/v3 v3.2.1
github.com/PaesslerAG/jsonpath v0.1.1
github.com/carolynvs/aferox v0.3.0
Expand All @@ -27,7 +27,7 @@ require (
github.com/cnabio/cnab-go v0.25.1
github.com/cnabio/cnab-to-oci v0.4.0
github.com/cnabio/image-relocation v0.9.0
github.com/containerd/containerd v1.7.17
github.com/containerd/containerd v1.7.18
github.com/davecgh/go-spew v1.1.1
github.com/docker/buildx v0.11.2
github.com/docker/cli v24.0.5+incompatible
Expand All @@ -36,7 +36,7 @@ require (
github.com/dustin/go-humanize v1.0.1
github.com/ghodss/yaml v1.0.0
github.com/google/go-cmp v0.6.0
github.com/google/go-containerregistry v0.19.0
github.com/google/go-containerregistry v0.19.2
github.com/google/uuid v1.6.0
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
Expand All @@ -53,10 +53,10 @@ require (
github.com/moby/term v0.5.0
github.com/olekukonko/tablewriter v0.0.5
github.com/opencontainers/go-digest v1.0.0
github.com/osteele/liquid v1.3.0
github.com/osteele/liquid v1.4.0
github.com/pelletier/go-toml v1.9.5
github.com/prometheus/client_golang v1.19.1
github.com/spf13/afero v1.9.5
github.com/spf13/afero v1.11.0
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.14.0
Expand All @@ -66,16 +66,16 @@ require (
github.com/xeipuuv/gojsonschema v1.2.0
go.mongodb.org/mongo-driver v1.13.1
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0
go.opentelemetry.io/otel v1.27.0
go.opentelemetry.io/otel v1.28.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0
go.opentelemetry.io/otel/sdk v1.27.0
go.opentelemetry.io/otel/trace v1.27.0
go.opentelemetry.io/otel/trace v1.28.0
go.uber.org/zap v1.27.0
golang.org/x/sync v0.7.0
google.golang.org/grpc v1.64.0
google.golang.org/grpc v1.64.1
google.golang.org/protobuf v1.34.1
gopkg.in/AlecAivazis/survey.v1 v1.8.8
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
Expand Down Expand Up @@ -111,6 +111,7 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/continuity v0.4.2 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/containerd/typeurl/v2 v2.1.1 // indirect
Expand All @@ -127,7 +128,7 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fvbommel/sortorder v1.1.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand Down Expand Up @@ -222,17 +223,16 @@ require (
github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.44.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
go.opentelemetry.io/otel/metric v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.20.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
Expand Down
Loading

0 comments on commit 70fa454

Please sign in to comment.