dockerfiles: add FLUENT_BIT_VERSION environment variable to containers (#5585)

* dockerfiles: add FLUENT_BIT_VERSION environment variable to containers

Signed-off-by: Patrick Stephens <[email protected]>

* dockerfiles: fix versioning

Signed-off-by: Patrick Stephens <[email protected]>

Author: Pat

.github/workflows/call-build-images.yaml

@@ -274,6 +274,7 @@ jobs:
           load: false
           build-args: |
             FLB_NIGHTLY_BUILD=${{ inputs.unstable }}
+            RELEASE_VERSION=${{ inputs.version }}
 
       - id: debug-meta
         uses: docker/metadata-action@v4
@@ -297,6 +298,7 @@ jobs:
           load: false
           build-args: |
             FLB_NIGHTLY_BUILD=${{ inputs.unstable }}
+            RELEASE_VERSION=${{ inputs.version }}
 
   call-build-images-generate-schema:
     needs:

dockerfiles/Dockerfile

@@ -10,8 +10,8 @@
 # docker buildx inspect --bootstrap
 # docker buildx build --platform "linux/amd64,linux/arm64,linux/arm/v7" -f ./dockerfiles/Dockerfile.multiarch --build-arg FLB_TARBALL=https://github.com/fluent/fluent-bit/archive/v1.8.11.tar.gz ./dockerfiles/
 
-# Set this to the current release version
-ARG RELEASE_VERSION=1.9.1
+# Set this to the current release version: it gets done so as part of the release.
+ARG RELEASE_VERSION=1.9.5
 
 # For multi-arch builds - assumption is running on an AMD64 host
 FROM multiarch/qemu-user-static:x86_64-arm as qemu-arm32
@@ -146,6 +146,7 @@ RUN find /dpkg/ -type d -empty -delete && \
 # hadolint ignore=DL3006
 FROM gcr.io/distroless/cc-debian11 as production
 ARG RELEASE_VERSION
+ENV FLUENT_BIT_VERSION=${RELEASE_VERSION}
 LABEL description="Fluent Bit multi-architecture container image" \
       vendor="Fluent Organization" \
       version="${RELEASE_VERSION}" \
@@ -176,6 +177,7 @@ CMD ["/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/etc/fluent-bit.conf"]
 
 FROM debian:bullseye-slim as debug
 ARG RELEASE_VERSION
+ENV FLUENT_BIT_VERSION=${RELEASE_VERSION}
 LABEL description="Fluent Bit multi-architecture debug container image" \
       vendor="Fluent Organization" \
       version="${RELEASE_VERSION}-debug" \

update_version.sh

@@ -17,10 +17,7 @@ sed -i "s/FLB_VERSION_PATCH  [0-9]/FLB_VERSION_PATCH  $patch/g" CMakeLists.txt
 git commit -s -m "build: bump to v$1" -- CMakeLists.txt
 
 # Dockerfile
-sed -i "s/ENV FLB_MAJOR [0-9]/ENV FLB_MAJOR $major/g" dockerfiles/Dockerfile*
-sed -i "s/ENV FLB_MINOR [0-9]/ENV FLB_MINOR $minor/g" dockerfiles/Dockerfile*
-sed -i "s/ENV FLB_PATCH [0-9]/ENV FLB_PATCH $patch/g" dockerfiles/Dockerfile*
-sed -i "s/ENV FLB_VERSION [0-9].[0-9].[0-9]/ENV FLB_VERSION $1/g" dockerfiles/Dockerfile*
+sed -i "s/ARG RELEASE_VERSION=[0-9].[0-9].[0-9]/ARG RELEASE_VERSION=$1/g" dockerfiles/Dockerfile*
 
 git commit -s -m "dockerfile: bump to v$1" -- dockerfiles/*