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.

Sign up for GitHub

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

Jump to bottom

Docker-in-docker: Updates docker-init with "pkill" #711

Merged
merged 4 commits into from
Sep 29, 2023
Merged

Docker-in-docker: Updates docker-init with "pkill" #711

merged 4 commits into from
Sep 29, 2023

Conversation

samruddhikhandale
Copy link
Member

@samruddhikhandale samruddhikhandale commented Sep 28, 2023 •
edited
Loading

Fixes : devcontainers/images#729

When the universal image is built with latest docker-in-docker Feature, it fails to start docker daemon as containerd does not start (Reported in #671 (comment)) .The image is trying to retry the docker daemon startup, but as containerd (or/and dockerd) is not in a good state before, it fails to restart causing docker ps to fail.

find /run /var/run -iname 'docker*.pid' -delete || :
find /run /var/run -iname 'container*.pid' -delete || :

We do have these commands ^ but it simply removes the PID files, does not stop/clean the dockerd and containerd daemons

🧪 Tested these PR changes with universal:dev@sha256:b7a147f15c61f02b8220d1719431f205f65e48267ffed93e0b9c642c14cf956a image, docker ps is successful.

image

@samruddhikhandale samruddhikhandale marked this pull request as ready for review September 29, 2023 18:38
@samruddhikhandale samruddhikhandale requested a review from a team as a code owner September 29, 2023 18:38
joshspicer
joshspicer approved these changes Sep 29, 2023
View reviewed changes
Copy link
Member

@joshspicer joshspicer left a comment

Choose a reason for hiding this comment

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

looks very reasonable to me 👍

@samruddhikhandale samruddhikhandale merged commit 04cb7d1 into main Sep 29, 2023
111 checks passed
@samruddhikhandale samruddhikhandale deleted the samruddhikhandale/dnd-pkill branch September 29, 2023 19:02
@samruddhikhandale samruddhikhandale mentioned this pull request Sep 29, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joshspicer joshspicer joshspicer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Universal] Unpin docker-in-docker Feature version
2 participants
@samruddhikhandale @joshspicer