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

create_docker_sysext.sh: no containerd-shim in v23 and higher #31

Merged
merged 1 commit into from
Oct 25, 2023

Conversation

t-lo
Copy link
Member

@t-lo t-lo commented Oct 25, 2023

This change fixes a bug with ONLY_DOCKER builds in create_docker_sysext.sh. Docker binary releases version 23 and above do not ship /usr/bin/containerd-shim anymore, leading to the following error when building a "docker only" sysext w/o containerd:

rm: cannot remove 'docker/usr/bin/containerd-shim': No such file or directory

This PR handles versions below major release 23 separately and only deletes containerd-shim for these versions.

Tested with docker releases 20.10.9, 23.0.0, and 24.0.6.

This change fixes a bug with ONLY_DOCKER builds in
create_docker_sysext.sh. Docker binary releases version 23 and above do
not ship /usr/bin/containerd-shim anymore, leading to the following
error when building a "docker only" sysext w/o containerd:

rm: cannot remove 'docker/usr/bin/containerd-shim': No such file or directory

This PR handles versions below major release 23 separately and ony
deletes containerd-shim for these versions.

Signed-off-by: Thilo Fromm <[email protected]>
@t-lo t-lo requested a review from a team October 25, 2023 07:54
Copy link
Member

@krnowak krnowak left a comment

Choose a reason for hiding this comment

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

I'm only wondering why we weren't using rm -f in the first place.

@t-lo
Copy link
Member Author

t-lo commented Oct 25, 2023

I'm only wondering why we weren't using rm -f in the first place.

My first approach was to switch to -f but then I thought that we deliberately want this to break if docker ships different sets of binaries. Not sure 🤷

@t-lo t-lo merged commit 9850ffd into main Oct 25, 2023
@t-lo t-lo deleted the t-lo/fix-docker-23-containerd-shim branch October 25, 2023 07:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants