From 4a3ad09e6118a50d7f464aa7286d59554931f5f3 Mon Sep 17 00:00:00 2001 From: juicer Date: Thu, 2 Jan 2025 21:07:36 -0800 Subject: [PATCH] add VERSION file for fluentbit image Signed-off-by: juicer --- cmd/fluent-watcher/fluentbit/Dockerfile | 4 +++- cmd/fluent-watcher/fluentbit/Dockerfile.debug | 4 +++- cmd/fluent-watcher/fluentbit/VERSION | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 cmd/fluent-watcher/fluentbit/VERSION diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile b/cmd/fluent-watcher/fluentbit/Dockerfile index dd3b4eb64..051d99b3b 100644 --- a/cmd/fluent-watcher/fluentbit/Dockerfile +++ b/cmd/fluent-watcher/fluentbit/Dockerfile @@ -1,3 +1,5 @@ +ARG FLUENT_BIT_BASE_VERSION=3.2.4 + FROM golang:1.23.2-alpine3.19 as buildergo RUN mkdir -p /fluent-bit RUN mkdir -p /code @@ -6,7 +8,7 @@ WORKDIR /code RUN echo $(ls -al /code) RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go -FROM fluent/fluent-bit:3.1.8 +FROM fluent/fluent-bit:${FLUENT_BIT_BASE_VERSION} LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0" COPY conf/fluent-bit.conf conf/fluent-bit.yaml conf/parsers.conf /fluent-bit/etc/ diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile.debug b/cmd/fluent-watcher/fluentbit/Dockerfile.debug index 1cdfcb1fc..839253480 100644 --- a/cmd/fluent-watcher/fluentbit/Dockerfile.debug +++ b/cmd/fluent-watcher/fluentbit/Dockerfile.debug @@ -1,3 +1,5 @@ +ARG FLUENT_BIT_BASE_VERSION=3.2.4 + FROM golang:1.23.2-alpine3.19 as buildergo RUN mkdir -p /fluent-bit RUN mkdir -p /code @@ -6,7 +8,7 @@ WORKDIR /code RUN echo $(ls -al /code) RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go -FROM fluent/fluent-bit:3.1.8-debug +FROM fluent/fluent-bit:${FLUENT_BIT_BASE_VERSION}-debug LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0" COPY conf/fluent-bit.conf conf/fluent-bit.yaml conf/parsers.conf /fluent-bit/etc/ diff --git a/cmd/fluent-watcher/fluentbit/VERSION b/cmd/fluent-watcher/fluentbit/VERSION new file mode 100644 index 000000000..9b7a431d9 --- /dev/null +++ b/cmd/fluent-watcher/fluentbit/VERSION @@ -0,0 +1 @@ +3.2.4 \ No newline at end of file