Merge branch 'master' into mauro/update-valijson

.gitmodules

@@ -64,3 +64,7 @@
 	path = builder/third_party/c-ares
 	url = https://github.com/c-ares/c-ares.git
 	branch = main
+[submodule "builder/third_party/tbb"]
+	path = builder/third_party/tbb
+	url = https://github.com/oneapi-src/oneTBB.git
+	branch = master

.tekton/collector-component-pipeline.yaml

@@ -208,6 +208,9 @@ spec:
       - name: kind
         value: task
       resolver: bundles
+    workspaces:
+    - name: git-basic-auth
+      workspace: git-auth
 
   - name: build-container-amd64
     params:
@@ -394,6 +397,8 @@ spec:
       - $(tasks.build-container-s390x.results.IMAGE_REF)
       - $(tasks.build-container-ppc64le.results.IMAGE_REF)
       - $(tasks.build-container-arm64.results.IMAGE_REF)
+    - name: IMAGE_EXPIRES_AFTER
+      value: $(params.image-expires-after)
     taskRef:
       params:
       - name: name
@@ -425,6 +430,8 @@ spec:
       - $(tasks.build-container-s390x.results.IMAGE_REF)
       - $(tasks.build-container-ppc64le.results.IMAGE_REF)
       - $(tasks.build-container-arm64.results.IMAGE_REF)
+    - name: IMAGE_EXPIRES_AFTER
+      value: $(params.image-expires-after)
     taskRef:
       params:
       - name: name
@@ -526,6 +533,8 @@ spec:
     params:
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
+    - name: CACHI2_ARTIFACT
+      value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
     - name: image-digest
       value: $(tasks.build-image-index.results.IMAGE_DIGEST)
     - name: image-url
@@ -583,3 +592,25 @@ spec:
     - input: $(params.skip-checks)
       operator: in
       values: ["false"]
+
+  - name: push-dockerfile
+    params:
+    - name: IMAGE
+      value: $(tasks.build-image-index.results.IMAGE_URL)
+    - name: IMAGE_DIGEST
+      value: $(tasks.build-image-index.results.IMAGE_DIGEST)
+    - name: DOCKERFILE
+      value: $(params.dockerfile)
+    - name: CONTEXT
+      value: $(params.path-context)
+    - name: SOURCE_ARTIFACT
+      value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
+    taskRef:
+      params:
+      - name: name
+        value: push-dockerfile-oci-ta
+      - name: bundle
+        value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:a28f33b69b270c4e8def293ff6d19ecc9789e1fee5a5929f1250a2e6cbabed81
+      - name: kind
+        value: task
+      resolver: bundles

.tekton/determine-image-tag-task.yaml

@@ -41,4 +41,15 @@ spec:
       dnf -y install git make
 
       .konflux/scripts/fail-build-if-git-is-dirty.sh
-      echo -n "$(make --quiet --no-print-directory tag)$(params.TAG_SUFFIX)" | tee "$(results.IMAGE_TAG.path)"
+
+      # First, try take git tag if it's a tagged commit.
+      tag="$(git tag --points-at)"
+      if [[ -z "$tag" ]]; then
+        # If not, use make target's output.
+        tag="$(make --quiet --no-print-directory tag)"
+      elif [[ "$(wc -l <<< "$tag")" -gt 1 ]]; then
+        >&2 echo -e "Error: the HEAD commit has multiple tags, don't know which one to choose:\n$tag"
+        exit 5
+      fi
+
+      echo -n "${tag}$(params.TAG_SUFFIX)" | tee "$(results.IMAGE_TAG.path)"

Makefile

@@ -28,6 +28,9 @@ ifneq ($(BUILD_BUILDER_IMAGE), false)
 		-t quay.io/stackrox-io/collector-builder:$(COLLECTOR_BUILDER_TAG) \
 		-f "$(CURDIR)/builder/Dockerfile" \
 		"$(CURDIR)/builder"
+else
+	docker pull --platform ${PLATFORM} \
+		quay.io/stackrox-io/collector-builder:$(COLLECTOR_BUILDER_TAG)
 endif
 
 collector: check-builder
@@ -82,7 +85,7 @@ endif
 start-builder: builder teardown-builder
 	docker run -d \
 		--name $(COLLECTOR_BUILDER_NAME) \
-		--pull missing \
+		--pull never \
 		--platform ${PLATFORM} \
 		-v $(CURDIR):$(CURDIR) \
 		$(if $(LOCAL_SSH_PORT),-p $(LOCAL_SSH_PORT):22 )\

builder/install/40-civetweb.sh

@@ -8,5 +8,12 @@ cp LICENSE.md "${LICENSE_DIR}/CivetWeb-${CIVETWEB_VERSION}"
 
 mkdir cmake-build
 cd cmake-build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCIVETWEB_ENABLE_CXX=ON -DBUILD_SHARED_LIBS:BOOL=NO -DCIVETWEB_BUILD_TESTING=NO ..
+cmake -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/local \
+    -DCIVETWEB_ENABLE_CXX=ON \
+    -DBUILD_SHARED_LIBS:BOOL=NO \
+    -DCIVETWEB_BUILD_TESTING=NO \
+    -DCIVETWEB_ENABLE_IPV6=NO \
+    -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=NO \
+    ..
 cmake --build . --target install ${NPROCS:+-j ${NPROCS}}

builder/install/60-jsoncpp.sh

@@ -8,5 +8,12 @@ cp LICENSE "${LICENSE_DIR}/jsoncpp-${JSONCPP_REVISION}"
 
 mkdir cmake-build
 cd cmake-build
-cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-fPIC ..
+cmake -DCMAKE_INSTALL_PREFIX=/usr/local \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_CXX_FLAGS=-fPIC \
+    -DJSONCPP_WITH_TESTS=OFF \
+    -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DBUILD_OBJECT_LIBS=OFF \
+    ..
 cmake --build . --target install ${NPROCS:+-j ${NPROCS}}

builder/install/60-tbb.sh

@@ -7,10 +7,12 @@ if [ -n "${WITH_RHEL_RPMS}" ]; then
     exit 0
 fi
 
-git clone --branch "$TBB_VERSION" --depth 1 https://github.com/intel/tbb
-cd tbb
-cp LICENSE "${LICENSE_DIR}/tbb-${TBB_VERSION}"
-make ${NPROCS:+-j ${NPROCS}} tbb_build_dir=./build tbb_build_prefix=lib extra_inc=big_iron.inc
-mkdir -p /usr/local/include
-cp -r ./include/tbb /usr/local/include/
-cp ./build/lib_release/libtbb.a /usr/local/lib/
+cd third_party/tbb
+cp LICENSE.txt "${LICENSE_DIR}/tbb-${TBB_VERSION}"
+cmake -B cmake-build -S . \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/local \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DTBB_TEST=OFF \
+    -DTBBMALLOC_BUILD=OFF
+cmake --build cmake-build --target install ${NPROCS:+-j ${NPROCS}}

builder/install/versions.sh

@@ -4,14 +4,15 @@ export B64_VERSION=1.2.1
 export CARES_VERSION=1.34.2
 export GOOGLETEST_REVISION=release-1.10.0
 export GRPC_REVISION=v1.67.0
-export JSONCPP_REVISION=0.10.7
-export PROMETHEUS_CPP_REVISION=v0.9.0
+export JSONCPP_REVISION=1.9.6
+export PROMETHEUS_CPP_REVISION=v1.2.4
 export PROTOBUF_VERSION=v28.3
-export TBB_VERSION=2018_U5
-export CIVETWEB_VERSION=v1.15
+export TBB_VERSION=2022.0.0
+export CIVETWEB_VERSION=v1.16
 export ABSEIL_VERSION=20240722.0
 export VALIJSON_VERSION=1.0.3
-export RE2_VERSION=2022-06-01
+export RE2_VERSION=2024-07-02
 export GPERFTOOLS_VERSION=2.16
 export UTHASH_VERSION=v1.9.8
 export YAMLCPP_VERSION=0.8.0
+export LIBBPF_VERSION=v1.3.4