Skip to content

Commit

Permalink
Add collector version to compilation step
Browse files Browse the repository at this point in the history
Yet another mistake from #1814. The version of collector is now
hardcoded into the binary, but that needs to be set at compile time,
which was not being done in konflux builds. The label with the version
was being set properly, this only affects collector printing its version
to the logs.
  • Loading branch information
Molter73 committed Sep 4, 2024
1 parent f3a66fa commit 1cf1613
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions collector/container/konflux.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG BUILD_DIR=/build
ARG CMAKE_BUILD_DIR=${BUILD_DIR}/cmake-build
ARG COLLECTOR_TAG


# Builder
Expand Down Expand Up @@ -83,6 +84,7 @@ RUN ./builder/install/install-dependencies.sh && \
-DDISABLE_PROFILING=${DISABLE_PROFILING} \
-DUSE_VALGRIND=${USE_VALGRIND} \
-DADDRESS_SANITIZER=${ADDRESS_SANITIZER} \
-DCOLLECTOR_VERSION=${COLLECTOR_TAG} \
-DTRACE_SINSP_EVENTS=${TRACE_SINSP_EVENTS} && \
cmake --build ${CMAKE_BUILD_DIR} --target all -- -j "${NPROCS:-4}" && \
ctest -V --test-dir ${CMAKE_BUILD_DIR} && \
Expand Down Expand Up @@ -118,8 +120,6 @@ FROM scratch

COPY --from=rpm-implanter-app /mnt /

ARG COLLECTOR_TAG

WORKDIR /

LABEL \
Expand Down

0 comments on commit 1cf1613

Please sign in to comment.