dockerfiles: backport systemd lib fixes from #3177 to 1.8#4567
dockerfiles: backport systemd lib fixes from #3177 to 1.8#4567niedbalski merged 3 commits intofluent:1.8from equinix-ms:backport-3177
Conversation
|
I presume you have but for completeness, what testing did you do? Best to follow the template if you can. |
|
So this is almost good to go from a CI perspective, I'll let someone else review the actual content. Ignore the mergebot failure. |
|
DCO needs fixing |
|
I amended @yasn77 's commit, so it my sign-off as well. |
This commit is originally from @yasn77, but I had to sign it myself in order to pass DCO checks. Commit message below is originally theirs. The libraries created in the docker image can not read the journal db in newer versions of systemd. This specifically impacts users that run systemd `246` or above on their host server: > * systemd-journald gained support for zstd compression of large fields in > journal files. The hash tables in journal files have been hardened against > hash collisions. This is an incompatible change and means that journal files > created with new systemd versions are not readable with old versions. If the > $SYSTEMD_JOURNAL_KEYED_HASH boolean environment variable for > systemd-journald.service is set to 0 this new hardening functionality may be > turned off, so that generated journal files remain compatible with older > journalctl implementations. (Taken from https://github.com/systemd/systemd/blob/v246/NEWS) This commit uses the backported version of the systemd libs, which are `247` for Debian buster. Fixing it for most distributions. It might be worth considering having a separate build stage for systemd, that would give better flexibility of the version shipped in the image. Signed-off-by: Yasser Saleemi <yassersaleemi@gmail.com> Signed-off-by: Jorik Jonker <jorik.jonker@eu.equinix.com>
|
@jonkerj is there any impact on ARM builds? I notice this is just for AMD64 targets and we've been burnt with missing changes on ARM before so wanted to check. |
|
I'm not the author of this change (@yasn77 is), but looking at the changed files, it affects amd64, armv7 and arm64v8, so we're good here. |
|
Oh yeah, sorry not sure how or why I missed that! Did you test the arm ones at least run up? I resolved an issue previously with a change which just broke them hence my concern: #4404 |
|
Nope, sorry, I cannot test this easily. But I think if it builds (which is does) and runs on AMD64 (ditto), there is no reason why it would not work on Arm, as the changes incorporate installing the same backported packages. |
|
Ok I'll see if I can verify here just to confirm. Then we're good for merge. |
|
Changes required One slight issue is that a separate change has bumped the 1.8 branch to use 1.8.12 which doesn't exist (yet) so fails to build this PR. I therefore specified the 1.8.11 tarball during build: This then triggers what I was worried about, namely #4404. ARM 64 does not even build: Therefore we need to include the changes from #4405 and #4408 . |
Signed-off-by: Patrick Stephens <pat@calyptia.com> Signed-off-by: Jorik Jonker <jorik.jonker@eu.equinix.com>
Signed-off-by: Patrick Stephens <pat@calyptia.com> Signed-off-by: Jorik Jonker <jorik.jonker@eu.equinix.com>
I've cherry-picked both (5c6b520 and 95253bf), and added my sign-off. EDIT: meh, I booboo'd. I could have clicked "accept changed". What do you want me to do, @patrick-stephens ? |
I'm not sure I follow. ARM 64 also looks good now: @jonkerj is there any test you want me to run? It'll have to be a simple one just to verify the packages are the right versions, etc. |
After I cherry picked the changes to my branch by hand, I noticed you have suggested changes using GitHub UI, which I could have accepted. So I either revert the cherry picks, force-push, and accept your suggestions, or I discard them, as the branch is OK now. |
Ah right, I'm happy with it as it stands. Up to @niedbalski to approve though. |
|
@edsiper so you're aware of a request for a new 1.8 release (at least container images) |
Testing
Before we can approve your change; please submit the following in a comment:
Documentation
The 1.8 branch is not working on recent Flatcar Linux systems, because of incompatibility in systemd libs. #3177 took care of that, but targets master (ie, future 1.9). This PR is a cherry pick of @yasn77's commit, but targets 1.8.
What I did to test:
git checkout v1.8.11git cherry-pick 3f991077docker build -f dockerfiles/Dockerfile.x86_64-master