Skip to content

Commit 8761b6a

Browse files
authored
Merge branch 'main' into dependabot/github_actions/golangci/golangci-lint-action-8
2 parents 983da8e + b3a1e69 commit 8761b6a

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.github/workflows/sanity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
# Make sure binaries compile on multiple platforms.
5050
crossbuild:
5151
name: "Build / Crossbuild Binaries"
52-
runs-on: ubuntu-20.04
52+
runs-on: ubuntu-latest
5353
strategy:
5454
fail-fast: false
5555
matrix:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ $ cat > /etc/cdi/vendor.json <<EOF
159159
{"hostPath": "tmpfs", "containerPath": "/tmp/data", "type": "tmpfs", "options": ["nosuid","strictatime","mode=755","size=65536k"]}
160160
],
161161
"hooks": [
162-
{"createContainer": {"path": "/bin/vendor-hook"} },
163-
{"startContainer": {"path": "/usr/bin/ldconfig"} }
162+
{"hookName": "createContainer", "path": "/bin/vendor-hook" },
163+
{"hookName": "startContainer", "path": "/usr/bin/ldconfig" }
164164
]
165165
}
166166
}

SECURITY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Security Policy
22

3+
Please contact the CNCF `[email protected]`

SPEC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ The `containerEdits` field has the following definition:
254254
## Error Handling
255255
* Kind requested is not present in any CDI file.
256256
Container runtimes should surface an error when a non-existent kind is requested.
257-
* Device (not device node) Requested does not exist.
257+
* Device (not device node) Requested device does not exist.
258258
Container runtimes should surface this error when a non existent device is requested.
259259
* "Resource" does not exist (e.g: Mount, Hook, ...).
260260
Container runtimes should surface this error when a non-existent "resource" is requested (e.g: at "run" time).

0 commit comments

Comments
 (0)