Update runtime-spec to current upstream #1036
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
runc currently fails to build against the upstream version of runtime-spec/specs-go. ``` # github.com/opencontainers/runc ./spec.go:189: cannot use specs.Linux literal (type specs.Linux) as type *specs.Linux in field value ``` on account of opencontainers/runtime-spec@6323157#diff-7f24d60f0cbb9c433e165467e3d34838R25 This commit updates the dependency to current runtime-spec master and fixes the type mismatch. Fixes #1035 Signed-off-by: Adam Thomason <ad@mthomason.net>
|
You'll need to fix the failing tests by making them more pointer-friendly (check for |
Signed-off-by: Adam Thomason <ad@mthomason.net>
Tracks schema/schema.json → schema/config-schema.json rename in opencontainers/runtime-spec@59ede1a Signed-off-by: Adam Thomason <ad@mthomason.net>
|
@cyphar Sure, done. Also fixed up a config path. CI now passes. |
|
LGTM |
1 similar comment
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
runc currently fails to build against the upstream version of runtime-spec/specs-go:
on account of opencontainers/runtime-spec@6323157#diff-7f24d60f0cbb9c433e165467e3d34838R25
This PR updates the dependency to current runtime-spec master, fixes the type mismatch, adds nil pointer checks, and updates spec config paths.
Fixes #1035
Signed-off-by: Adam Thomason ad@mthomason.net