Skip to content
This repository was archived by the owner on Apr 24, 2023. It is now read-only.

Conversation

@anouarchattouna
Copy link

Using gcr.io/distroless/cc-debian11 instead of gcr.io/distroless/cc-debian10
Using LABEL instead of MAINTAINER (deprecated)

Using gcr.io/distroless/cc-debian11 instead of gcr.io/distroless/cc-debian10
Using LABEL instead of MAINTAINER (deprecated)

Signed-off-by: Anouar Chattouna <anouar.chattouna@mirakl.com>
@PascalBourdier
Copy link

@edsiper are you OK with that ?

@antoniomrfranco
Copy link

Hi @PascalBourdier @edsiper, is this PR ready to merge? Thanks!

@anouarchattouna
Copy link
Author

@edsiper can you merge this, please?

@agup006
Copy link
Member

agup006 commented Jan 20, 2022

Adding @patrick-stephens

@patrick-stephens
Copy link
Collaborator

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.

@edsiper
Copy link
Member

edsiper commented Jan 20, 2022

@patrick-stephens if I am not wrong this also needs other adjustment rights ? (systemd)

@patrick-stephens
Copy link
Collaborator

patrick-stephens commented Jan 20, 2022

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):

I 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.

@patrick-stephens
Copy link
Collaborator

@niedbalski can probably confirm or correct me but I believe the plan is to deprecate this repository from the 1.9 release series?

@niedbalski
Copy link
Contributor

@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

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants