Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/github.com/moby/buildk…
Browse files Browse the repository at this point in the history
…it-0.13.0-beta1
  • Loading branch information
schristoff authored Oct 19, 2023
2 parents 652981b + da36569 commit 17558c4
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 4 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/check-licenses.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Check licenses
on:
push:
pull_request:
branches:
- main

jobs:
check:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version-file: go.mod
cache: true
- name: Install go-licenses
run: go install github.com/google/[email protected]
- name: Check licenses
run: |
go-licenses check ./... \
--ignore github.com/xi2/xz,golang.org/x/sys/unix # https://github.com/xi2/xz/blob/master/LICENSE
12 changes: 8 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Unless the issue specifically mentions a branch, please create your feature bran

For example:

```
```bash
# Make sure you have the most recent changes to main
git checkout main
git pull
Expand Down Expand Up @@ -177,7 +177,7 @@ have the right to contribute the code you are submitting to the project.

You sign-off by adding the following to your commit messages:

```
```bash
Author: Your Name <[email protected]>
Date: Thu Feb 2 11:41:15 2018 -0800

Expand All @@ -191,12 +191,16 @@ be rejected by the automated DCO check.

Git has a `-s` command line option to do this automatically:

git commit -s -m 'This is my commit message'
```
git commit -s -m 'This is my commit message'
```

If you forgot to do this and have not yet pushed your changes to the remote
repository, you can amend your commit with the sign-off by running

git commit --amend -s
```
git commit --amend -s
```

## The life of a pull request

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,4 @@ and we will add you. **All** contributors belong here. 💯
- [Sumit Kumar Soni](https://github.com/zelfroster)
- [Chaiyapruek Muangsiri](https://github.com/cmppoon)
- [Xin Fu](https://github.com/imfing)
- [KallyDev](https://github.com/kallydev)
9 changes: 9 additions & 0 deletions docs/content/wiring.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@ You can also provide any other attributes, as specified by the CNAB [parameters]
default: "wordpress"
```

If you decide to use the default parameter field, you must set it as the empty value.
However, it must be passed in as an empty type. For example, for an empty string, pass in `""` as the default, or for an object use `{}`:

```yaml
- name: command
type: object
default: {}
```

### File Parameters

Porter also enables the use of file parameters in a bundle.
Expand Down

0 comments on commit 17558c4

Please sign in to comment.