Open anouarchattouna opened 2 years ago
@edsiper are you OK with that ?
Hi @PascalBourdier @edsiper, is this PR ready to merge? Thanks!
@edsiper can you merge this, please?
Adding @patrick-stephens
Yeah the main repo ones have been updated but I raised an issue on sorting the labels out similar to here. I also modified the maintainer email.
We probably should update the busy box version here and I think I had to make a tweak to the location of some system libraries.
I'm not sure what the longer term plan is for this repo plus there is a bit of a delta between master and the 1.8 branch we probably should sort.
@patrick-stephens if I am not wrong this also needs other adjustment rights ? (systemd)
Yeah there was a bit of a delta between what is on master
and the 1.8
branch here. For those other changes for the ARM images to be backported to 1.8 I used the 1.8
branch. They also did not want a Debian base image update.
The changes I made to get a working Debian 11 container are all on: https://github.com/fluent/fluent-bit/pull/4516/files Specifically for this file (rather than the ARM ones):
libgcrypt
(this is the problem with doing direct library copying): https://github.com/fluent/fluent-bit/blob/938a53b9337b1a2bb9dcb8636dfa75f49a51b0ce/dockerfiles/Dockerfile.x86_64#L80I did do some other general improvements highlighted during linting as well. I'm afraid I was not aware of this repo at that point and when I looked to do the 1.8
backporting of the systemd updates I targeted them at that specific branch. Master currently seems to have 1.7 variables in it which is a bit confusing too.
@niedbalski can probably confirm or correct me but I believe the plan is to deprecate this repository from the 1.9 release series?
@patrick-stephens correct, ideally changes should go upstream now on, the plan is to archive this repository from 1.9 ongoing and all changes has to be synced in the fluent/fluent-bit repository. For the OCI labels I think you're addressing those on #4636 and debian11 has been updated across on https://github.com/fluent/fluent-bit/blob/9ef9d6d7dcea9a97c38dac806c29e867a8d9f793/dockerfiles/Dockerfile.multiarch
Using
gcr.io/distroless/cc-debian11
instead ofgcr.io/distroless/cc-debian10
UsingLABEL
instead ofMAINTAINER
(deprecated)