Skip to content

Make binary: install all containerd shims to bundles#40882

Merged
tiborvass merged 1 commit intomoby:masterfrom
thaJeztah:containerd_all_binaries
May 5, 2020
Merged

Make binary: install all containerd shims to bundles#40882
tiborvass merged 1 commit intomoby:masterfrom
thaJeztah:containerd_all_binaries

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented May 1, 2020

The containerd.installer was updated to also copy containerd-shim-runc-v2 (in #40658), but hack/make/binary-daemon did not copy it to the bundles directory.

@thaJeztah
Copy link
Copy Markdown
Member Author

ping @AkihiroSuda @cpuguy83 PTAL

@thaJeztah thaJeztah added this to the 20.03.0 milestone May 1, 2020
Comment thread hack/dockerfile/install/containerd.installer Outdated
@thaJeztah
Copy link
Copy Markdown
Member Author

@AkihiroSuda @tiborvass updated PTAL

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be curly braces

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why here? this is supposed to be at top of files

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did the () braces to run it in a sub-shell, so that the set -e wouldn't affect other scripts running in the same session. Not sure if that makes sense 😅

The containerd.installer was updated to also copy `containerd-shim-runc-v2`,
but `hack/make/binary-daemon` did not copy it to the bundles directory.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the containerd_all_binaries branch from 4211a28 to f85bea4 Compare May 2, 2020 15:29
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented May 2, 2020

@tiborvass I removed the changes to containerd.installer from this PR (moved to #40892); PTAL

@thaJeztah
Copy link
Copy Markdown
Member Author

@tiborvass good to go?

@tiborvass tiborvass merged commit 1655290 into moby:master May 5, 2020
@thaJeztah thaJeztah deleted the containerd_all_binaries branch May 5, 2020 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants