Skip to content

Add OS_DIGEST to track sha256 used for AmazonLinux version #1038

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
Open
wants to merge 3 commits into
base: mainline
Choose a base branch
from
Open

Add OS_DIGEST to track sha256 used for AmazonLinux version #1038

wants to merge 3 commits into from

Conversation

@ShelbyZ
Copy link
Contributor

@ShelbyZ ShelbyZ commented Nov 12, 2025

Summary

  • Update makefile to pull OS_DIGEST from linux.version
  • Update dockerfiles to use OS_DIGEST to pull the AmazonLinux images
  • Update versions with docker label changes
  • Update generate_changelog.sh to pull the SHA256 and update linux.version

Testing

Built and tested AL2/AL2023 images locally:

AL2

docker inspect amazon/aws-for-fluent-bit:latest-al2 --format='{{json .Config.Labels}}' | jq -C '.' 
{
  "author": "FireLens Team <aws-firelens@amazon.com>",
  "com.aws-for-fluent-bit.fluent-bit.version": "1.9.10",
  "com.aws-for-fluent-bit.os.image-id": "amzn2-container-raw-2.0.20251108.0-x86_64",
  "com.aws-for-fluent-bit.os.version": "Amazon Linux 2",
  "om.aws-for-fluent-bit.os.digest": "sha256:5ebd84068a008ca31f61b3b8fb58a201b53a31c7dd1123722704a61d853ab05f",
  "org.opencontainers.image.authors": "FireLens Team <aws-firelens@amazon.com>",
  "org.opencontainers.image.description": "AWS for Fluent Bit is the official AWS distribution of Fluent Bit. It is fully compatible with upstream Fluent Bit and is designed to be used on AWS environments like Amazon ECS and Amazon EKS.",
  "org.opencontainers.image.documentation": "https://github.com/aws/aws-for-fluent-bit",
  "org.opencontainers.image.licenses": "Apache-2.0",
  "org.opencontainers.image.source": "https://github.com/aws/aws-for-fluent-bit",
  "org.opencontainers.image.title": "AWS for Fluent Bit",
  "org.opencontainers.image.url": "https://gallery.ecr.aws/aws-observability/aws-for-fluent-bit",
  "org.opencontainers.image.vendor": "Amazon Web Services",
  "org.opencontainers.image.version": "2.34.1.20251031",
  "vendor": "Amazon Web Services",
  "version": "2.34.1.20251031"
}

AL2023

docker inspect amazon/aws-for-fluent-bit:latest-al2023 --format='{{json .Config.Labels}}' | jq -C '.'
{
  "author": "FireLens Team <aws-firelens@amazon.com>",
  "com.aws-for-fluent-bit.fluent-bit.version": "v4.1.1",
  "com.aws-for-fluent-bit.os.digest": "sha256:c929105619fbc4cb4cb2d0667a02b549a3408be98e89d9c61437ca702d04d829",
  "com.aws-for-fluent-bit.os.image-id": "al2023-container-2023.9.20251110.0-x86_64",
  "com.aws-for-fluent-bit.os.version": "Amazon Linux 2023.9.20251110",
  "org.opencontainers.image.authors": "FireLens Team <aws-firelens@amazon.com>",
  "org.opencontainers.image.description": "AWS for Fluent Bit is the official AWS distribution of Fluent Bit. It is fully compatible with upstream Fluent Bit and is designed to be used on AWS environments like Amazon ECS and Amazon EKS.",
  "org.opencontainers.image.documentation": "https://github.com/aws/aws-for-fluent-bit",
  "org.opencontainers.image.licenses": "Apache-2.0",
  "org.opencontainers.image.source": "https://github.com/aws/aws-for-fluent-bit",
  "org.opencontainers.image.title": "AWS for Fluent Bit",
  "org.opencontainers.image.url": "https://gallery.ecr.aws/aws-observability/aws-for-fluent-bit",
  "org.opencontainers.image.vendor": "Amazon Web Services",
  "org.opencontainers.image.version": "3.0.1",
  "vendor": "Amazon Web Services",
  "version": "3.0.1"
}

Tested generate_changelog.sh (publish=true)

AL2

./scripts/generate_changelog.sh
=== Latest Amazon Linux Image Information ===
Amazon Linux 2: 2.0.20251110.1
  SHA256: 5ebd84068a008ca31f61b3b8fb58a201b53a31c7dd1123722704a61d853ab05f

Set os-digest for AL 2 to sha256:5ebd84068a008ca31f61b3b8fb58a201b53a31c7dd1123722704a61d853ab05f
=============================================

### 2.34.1.20251031
This release includes:
* Fluent Bit [v1.9.10](https://github.com/fluent/fluent-bit/tree/v1.9.10)
* Amazon CloudWatch Logs for Fluent Bit 1.9.4
* Amazon Kinesis Streams for Fluent Bit 1.10.3
* Amazon Kinesis Firehose for Fluent Bit 1.7.2
* Amazon Linux 2 base container image version: 2.0.20251110.1

Compared to the previous release, this release adds:
* Fix - TODO blah blah [#TODO](https://github.com/amazon-contributing/upstream-to-fluent-bit/pull/TODO)
* Enhancement - TODO blah blah [#TODO](https://github.com/aws/aws-for-fluent-bit/pull/TODO)

AL2023

./scripts/generate_changelog.sh 
=== Latest Amazon Linux Image Information ===
Amazon Linux 2023: 2023.9.20251110.1
  SHA256: c929105619fbc4cb4cb2d0667a02b549a3408be98e89d9c61437ca702d04d829

Set os-digest for AL 2023 to sha256:c929105619fbc4cb4cb2d0667a02b549a3408be98e89d9c61437ca702d04d829
=============================================

### 3.0.1
This release includes:
* Fluent Bit [v4.1.1](https://github.com/fluent/fluent-bit/tree/v4.1.1)
* Amazon CloudWatch Logs for Fluent Bit 1.9.4
* Amazon Kinesis Streams for Fluent Bit 1.10.3
* Amazon Kinesis Firehose for Fluent Bit 1.7.2
* Minimal set of packages installed using Amazon Linux 2023 container image version: 2023.9.20251110.1

Compared to the previous release, this release adds:
* Fix - TODO blah blah [#TODO](https://github.com/amazon-contributing/upstream-to-fluent-bit/pull/TODO)
* Enhancement - TODO blah blah [#TODO](https://github.com/aws/aws-for-fluent-bit/pull/TODO)

Both

./scripts/generate_changelog.sh
=== Latest Amazon Linux Image Information ===
Amazon Linux 2: 2.0.20251110.1
  SHA256: 5ebd84068a008ca31f61b3b8fb58a201b53a31c7dd1123722704a61d853ab05f

Set os-digest for AL 2 to sha256:5ebd84068a008ca31f61b3b8fb58a201b53a31c7dd1123722704a61d853ab05f

Amazon Linux 2023: 2023.9.20251110.1
  SHA256: c929105619fbc4cb4cb2d0667a02b549a3408be98e89d9c61437ca702d04d829

Set os-digest for AL 2023 to sha256:c929105619fbc4cb4cb2d0667a02b549a3408be98e89d9c61437ca702d04d829
=============================================

### 2.34.1.20251031
This release includes:
* Fluent Bit [v1.9.10](https://github.com/fluent/fluent-bit/tree/v1.9.10)
* Amazon CloudWatch Logs for Fluent Bit 1.9.4
* Amazon Kinesis Streams for Fluent Bit 1.10.3
* Amazon Kinesis Firehose for Fluent Bit 1.7.2
* Amazon Linux 2 base container image version: 2.0.20251110.1

Compared to the previous release, this release adds:
* Fix - TODO blah blah [#TODO](https://github.com/amazon-contributing/upstream-to-fluent-bit/pull/TODO)
* Enhancement - TODO blah blah [#TODO](https://github.com/aws/aws-for-fluent-bit/pull/TODO)

### 3.0.1
This release includes:
* Fluent Bit [v4.1.1](https://github.com/fluent/fluent-bit/tree/v4.1.1)
* Amazon CloudWatch Logs for Fluent Bit 1.9.4
* Amazon Kinesis Streams for Fluent Bit 1.10.3
* Amazon Kinesis Firehose for Fluent Bit 1.7.2
* Minimal set of packages installed using Amazon Linux 2023 container image version: 2023.9.20251110.1

Compared to the previous release, this release adds:
* Fix - TODO blah blah [#TODO](https://github.com/amazon-contributing/upstream-to-fluent-bit/pull/TODO)
* Enhancement - TODO blah blah [#TODO](https://github.com/aws/aws-for-fluent-bit/pull/TODO)

Description for the changelog

Enhancement: Add OS_DIGEST to track sha256 used for AmazonLinux version

Licensing

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@ShelbyZ
Add OS_DIGEST to track sha256 used for AmazonLinux version
16fc8a9 
- Update makefile to pull OS_DIGEST from linux.version
- Update dockerfiles to use OS_DIGEST to pull the AmazonLinux images
- Update versions with docker label changes
- Update generate_changelog.sh to pull the SHA256 and update
  linux.version
@ShelbyZ ShelbyZ requested a review from a team as a code owner November 12, 2025 21:16
mye956
mye956 reviewed Nov 12, 2025
View reviewed changes
Makefile
OS_DIGEST ?= $(shell ./scripts/get_linux_version.sh ${BUILD_VERSION} os-digest)
# OS Pretty Name
OS_PRETTY_NAME := "$(shell docker run --rm public.ecr.aws/amazonlinux/amazonlinux:${AL_TAG} sh -c "grep '^PRETTY_NAME=' /etc/os-release | cut -d'\"' -f2")"
OS_PRETTY_NAME := "$(shell docker run --rm public.ecr.aws/amazonlinux/amazonlinux@${OS_DIGEST} sh -c "grep '^PRETTY_NAME=' /etc/os-release | cut -d'\"' -f2")"
Copy link
Contributor

@mye956 mye956 Nov 12, 2025

Choose a reason for hiding this comment

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

Note to self: Pretty name can be like "Amazon Linux 2" or "Amazon Linux 2023.2025XXXX"

mye956
mye956 reviewed Nov 12, 2025
View reviewed changes
prateekchaudhry
prateekchaudhry reviewed Nov 19, 2025
View reviewed changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@prateekchaudhry prateekchaudhry prateekchaudhry approved these changes

@mye956 mye956 mye956 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.

3 participants

@ShelbyZ @prateekchaudhry @mye956