workflows: fix up ARMV7 build

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

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

@@ -129,6 +129,7 @@ jobs:
           build-args: |
             FLB_NIGHTLY_BUILD=${{ inputs.unstable }}
             RELEASE_VERSION=${{ inputs.version }}
+            WAMR_BUILD_TARGET=${{ (contains(matrix.platform, 'arm/v7') && 'ARMV7') || '' }}
 
       - name: Export ${{ matrix.target }} digest
         run: |

dockerfiles/Dockerfile

@@ -66,6 +66,9 @@ COPY . ./
 # We split the builder setup out so people can target it or use as a base image without doing a full build.
 FROM builder-base AS builder
 WORKDIR /src/fluent-bit/build/
+
+ARG WAMR_BUILD_TARGET
+
 RUN cmake -DFLB_RELEASE=On \
     -DFLB_JEMALLOC=On \
     -DFLB_TLS=On \
@@ -79,6 +82,7 @@ RUN cmake -DFLB_RELEASE=On \
     -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
     -DFLB_LOG_NO_CONTROL_CHARS=On \
     -DFLB_CHUNK_TRACE="$FLB_CHUNK_TRACE" \
+    -DWAMR_BUILD_TARGET="${WAMR_BUILD_TARGET}" \
     ..
 
 RUN make -j "$(getconf _NPROCESSORS_ONLN)"

packaging/distros/raspbian/Dockerfile

@@ -71,7 +71,8 @@ ARG FLB_OUT_KAFKA=On
 ARG FLB_OUT_PGSQL=On
 ARG FLB_JEMALLOC=On
 ARG FLB_CHUNK_TRACE=On
-ARG WAMR_BUILD_TARGET=ARMV7A # Tell raspbian packages should be using armv7.
+#Tell raspbian packages should be using armv7.
+ARG WAMR_BUILD_TARGET=ARMV7A
 
 ENV CFLAGS=$CFLAGS
 RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \