Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support "bundle" in addition to "bundlePath" #33

Merged
merged 1 commit into from Sep 13, 2017

Conversation

giuseppe
Copy link
Member

It was changed in the OCI runtime spec to 1.0.0.rc5

Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com

@rhatdan
Copy link
Member

rhatdan commented Sep 13, 2017

If we change this, will it break on Docker which uses older versions of runc?

@pschiffe
Copy link

Without this PR I'm getting error:

oci-register-machine[1738]: 2017/09/13 11:43:13 RegisterMachine Failed to read /config.json open /config.json: no such file or directory

With the PR, oci-register-machine is working correctly for me. I'm using RHEL AH 7.4.1 with runc-1.0.0-12.1.gitf8ce01d.el7.x86_64

@giuseppe giuseppe changed the title Use bundle instead of bundlePath Support "bundle" in addition to "bundlePath" Sep 13, 2017
@giuseppe
Copy link
Member Author

@rhatdan yes, true. I've pushed a new version that supports both variants.

It was changed in the OCI runtime spec to 1.0.0.rc5, so support both
versions.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@pschiffe
Copy link

I can confirm that updated PR still works for me.

pschiffe pushed a commit to pschiffe/gce-system-container that referenced this pull request Sep 13, 2017
@rhatdan
Copy link
Member

rhatdan commented Sep 13, 2017

LGTM

@rhatdan rhatdan merged commit 085f9ca into projectatomic:master Sep 13, 2017
@rhatdan
Copy link
Member

rhatdan commented Sep 13, 2017

I have pushed updated versions of oci-register-machine into fedora updates testing. Please test and give good karma.

@pschiffe
Copy link

Awesome thanks. We also need updated rpm in RHEL Atomic Host - I've created bz here: https://bugzilla.redhat.com/show_bug.cgi?id=1491461

@rhatdan
Copy link
Member

rhatdan commented Sep 14, 2017

Yup, I asked @lsm5 to make this available in 7.4.2 release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants