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

Update to 20.10.6 #25

Merged
merged 1 commit into from
May 17, 2021
Merged

Update to 20.10.6 #25

merged 1 commit into from
May 17, 2021

Conversation

tianon
Copy link
Contributor

@tianon tianon commented Feb 3, 2021

This is an alternative/upgrade to #13 to see how bad the damage is. 😩 🙊

@tianon tianon force-pushed the 20.10 branch 8 times, most recently from d6cdf41 to 5e3f8d7 Compare February 3, 2021 17:27
@tianon
Copy link
Contributor Author

tianon commented Feb 3, 2021 •
edited
Loading

This error message is hilarious to read, knowing it's being read from journald:

2021-02-03T19:43:22Z docker.dockerd[12199]: time="2021-02-03T19:43:22.960766724Z" level=error msg="Handler for POST /v1.41/containers/943cf392d62f2c5ebcfd32909488f9265fd2a60bbbe9268e64bfce5add4af822/start returned error: failed to initialize logging driver: journald is not enabled on this host"

It comes from https://github.com/moby/moby/blob/v20.10.3/daemon/logger/journald/journald.go#L60, but the only substantive change to that file was updating from github.com/coreos/go-systemd/journal to github.com/coreos/go-systemd/v22/journal; looking at the diff in coreos/go-systemd@39ca1b0...2d78030#diff-724313773be2f14993c9b6e81803e33eb071b561d075f59bee32a5b2a09fa8f7, it seems the only real functional change there is net.Dial converted to net.ListenUnixgram. 😕

Edit: more specifically, that'd be coreos/go-systemd@728309f

@tianon
Copy link
Contributor Author

tianon commented Feb 3, 2021

Ooof, apparmor="DENIED" operation="ptrace" profile="snap.docker.dockerd" pid=12948 comm="ps" requested_mask="trace" denied_mask="trace" over and over and over and over (many, many times per second), but after filtering out all that noise, this looks relevant:

2021-02-03T20:18:38.0225521Z Feb 03 20:18:34 fv-az175-209 audit[12896]: AVC apparmor="DENIED" operation="bind" profile="snap.docker.dockerd" pid=12896 comm="exe" family="unix" sock_type="dgram" protocol=0 requested_mask="bind" denied_mask="bind" addr=none
2021-02-03T20:18:38.0227497Z Feb 03 20:18:34 fv-az175-209 kernel: audit: type=1400 audit(1612383514.377:425): apparmor="DENIED" operation="bind" profile="snap.docker.dockerd" pid=12896 comm="exe" family="unix" sock_type="dgram" protocol=0 requested_mask="bind" denied_mask="bind" addr=none
2021-02-03T20:18:38.0229429Z Feb 03 20:18:34 fv-az175-209 audit[12903]: AVC apparmor="DENIED" operation="bind" profile="snap.docker.dockerd" pid=12903 comm="exe" family="unix" sock_type="dgram" protocol=0 requested_mask="bind" denied_mask="bind" addr=none
2021-02-03T20:18:38.0231357Z Feb 03 20:18:34 fv-az175-209 kernel: audit: type=1400 audit(1612383514.645:426): apparmor="DENIED" operation="bind" profile="snap.docker.dockerd" pid=12903 comm="exe" family="unix" sock_type="dgram" protocol=0 requested_mask="bind" denied_mask="bind" addr=none
2021-02-03T20:18:38.0233250Z Feb 03 20:18:34 fv-az175-209 audit[12910]: AVC apparmor="DENIED" operation="bind" profile="snap.docker.dockerd" pid=12910 comm="exe" family="unix" sock_type="dgram" protocol=0 requested_mask="bind" denied_mask="bind" addr=none
2021-02-03T20:18:38.0235199Z Feb 03 20:18:34 fv-az175-209 kernel: audit: type=1400 audit(1612383514.829:427): apparmor="DENIED" operation="bind" profile="snap.docker.dockerd" pid=12910 comm="exe" family="unix" sock_type="dgram" protocol=0 requested_mask="bind" denied_mask="bind" addr=none

I bet I need to connect the interface before I try to use the journald logger, and possibly even restart the Docker daemon, but it is strange that it can't even detect whether or not journald is enabled anymore. 😞

Looks like coreos/go-systemd#331 is likely related and/or discussion of this very issue.

@tianon tianon force-pushed the 20.10 branch 4 times, most recently from d057064 to 634b051 Compare February 3, 2021 22:20
@anonymouse64
Copy link
Contributor

Regarding the go-systemd issue, I have filed another update to docker-support, just adding the same rule that we already provide to kubernetes-support for the same reason: canonical/snapd#9924, I hope to get that one into 2.50

@tianon tianon force-pushed the 20.10 branch 2 times, most recently from 8a5930d to 3f78e75 Compare April 27, 2021 00:49
@tianon tianon changed the title Update to 20.10.3 Update to 20.10.6 Apr 27, 2021
@tianon tianon force-pushed the 20.10 branch 4 times, most recently from a8010d2 to 38606a8 Compare April 27, 2021 18:06
@tianon
Copy link
Contributor Author

tianon commented Apr 27, 2021

Ugh, moby/buildkit#1533 breaks Git via BuildKit again...

(specifically https://github.com/moby/buildkit/pull/1533/files#diff-9a3248027714dcbcf2647fa27b75ec4dd3d9639ae80c40bfd6a68abd7805bd4eR494-R498 clears git's environment and didn't previously, so we'll have to change how we make sure git gets our GIT_* variables now)

@tianon tianon force-pushed the 20.10 branch 6 times, most recently from e22e401 to 3a0a072 Compare April 27, 2021 23:12
@tianon
Copy link
Contributor Author

tianon commented Apr 27, 2021

(Now that I've got #27 working, I've rebased this on that to see if that helps here.)

@tianon
Copy link
Contributor Author

tianon commented Apr 27, 2021

Ugh, we get bit by the same change because we lose Snappy's LD_LIBRARY_PATH.

@tianon tianon marked this pull request as ready for review April 28, 2021 17:22
@tianon
Copy link
Contributor Author

tianon commented Apr 28, 2021

(Was hoping I could solve this without a patch, but as seen by the recent force push history here, no dice hahaha)

@tianon
Copy link
Contributor Author

tianon commented May 13, 2021

Looks like we might finally be good??

@anonymouse64
Copy link
Contributor

2.50 is now in stable BTW

anonymouse64
anonymouse64 approved these changes May 17, 2021
View reviewed changes
Copy link
Contributor

@anonymouse64 anonymouse64 left a comment

Choose a reason for hiding this comment

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

lgtm

dockerd-patches/snappy-buildkit-git-environ.patch
index 3d1bfe21f4..197c339c78 100644
--- a/vendor/github.com/moby/buildkit/source/git/gitsource.go
+++ b/vendor/github.com/moby/buildkit/source/git/gitsource.go
@@ -598,12 +598,11 @@ func git(ctx context.Context, dir, sshAuthSock, knownHosts string, args ...strin
Copy link
Contributor

Choose a reason for hiding this comment

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

nice catch here

@tianon tianon merged commit 922bf39 into canonical:main May 17, 2021
@tianon tianon deleted the 20.10 branch May 17, 2021 19:38
@tianon
Copy link
Contributor Author

tianon commented May 17, 2021

Appreciate the review! ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anonymouse64 anonymouse64 anonymouse64 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.
2 participants
@tianon @anonymouse64