From b87670ab3c908c9cb03928f01bc726ab030bd048 Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Wed, 5 Jun 2024 15:00:17 +1000 Subject: [PATCH] config: test build with FLB_HAVE_STATIC_CONF --- .github/workflows/pr-compile-check.yaml | 12 ++++++++++++ dockerfiles/Dockerfile.centos7 | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-compile-check.yaml b/.github/workflows/pr-compile-check.yaml index d9f3dc92ab5..bbfc96b368e 100644 --- a/.github/workflows/pr-compile-check.yaml +++ b/.github/workflows/pr-compile-check.yaml @@ -30,3 +30,15 @@ jobs: push: false load: false provenance: false + + - name: Attempt to build current source for CentOS 7 using static config + uses: docker/build-push-action@v5 + with: + context: . + file: ./dockerfiles/Dockerfile.centos7 + # No need to use after this so discard completely + push: false + load: false + provenance: false + build-args: + - "FLB_STATIC_CONF=true" diff --git a/dockerfiles/Dockerfile.centos7 b/dockerfiles/Dockerfile.centos7 index daeb49a9771..d899821e250 100644 --- a/dockerfiles/Dockerfile.centos7 +++ b/dockerfiles/Dockerfile.centos7 @@ -16,6 +16,8 @@ RUN yum -y update && \ COPY . /src/ WORKDIR /src/build +ARG FLB_STATIC_CONF + RUN cmake3 -DCMAKE_INSTALL_PREFIX=/opt/fluent-bit/ -DCMAKE_INSTALL_SYSCONFDIR=/etc/ \ -DFLB_RELEASE=On -DFLB_TRACE=On \ -DFLB_TESTS_INTERNAL=On -DFLB_TESTS_RUNTIME=On \ @@ -23,6 +25,6 @@ RUN cmake3 -DCMAKE_INSTALL_PREFIX=/opt/fluent-bit/ -DCMAKE_INSTALL_SYSCONFDIR=/e -DFLB_OUT_KAFKA=On \ -DFLB_JEMALLOC=On \ -DFLB_CHUNK_TRACE=On \ - -DFLB_OUT_PGSQL=On ../ + -DFLB_OUT_PGSQL=On ${FLB_STATIC_CONF:+-DFLB_STATIC_CONF=/tmp} ../ RUN make -j "$(getconf _NPROCESSORS_ONLN)"