From 5dded8232c9baf0f185d728feedb93445f9cdd53 Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Tue, 21 Jan 2025 10:56:26 +0100 Subject: [PATCH 1/2] fix(ci): fixed reusable_build/publish_docker workflows. `upload-artifact` action since v4 does not allow to upload same artifact name multiple times. Signed-off-by: Federico Di Pierro --- .github/workflows/reusable_build_docker.yaml | 2 +- .github/workflows/reusable_publish_docker.yaml | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable_build_docker.yaml b/.github/workflows/reusable_build_docker.yaml index 6e1d5566b66..c67fd12ee42 100644 --- a/.github/workflows/reusable_build_docker.yaml +++ b/.github/workflows/reusable_build_docker.yaml @@ -83,6 +83,6 @@ jobs: - name: Upload images tarballs uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: - name: falco-images + name: falco-images-${{ inputs.arch }} path: /tmp/falco-*.tar retention-days: 1 diff --git a/.github/workflows/reusable_publish_docker.yaml b/.github/workflows/reusable_publish_docker.yaml index c8a609a1671..52c8c0db1a5 100644 --- a/.github/workflows/reusable_publish_docker.yaml +++ b/.github/workflows/reusable_publish_docker.yaml @@ -33,10 +33,16 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0 - - name: Download images tarballs + - name: Download x86_64 images tarballs uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: - name: falco-images + name: falco-images-x86_64 + path: /tmp/falco-images + + - name: Download aarch64 images tarballs + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + with: + name: falco-images-aarch64 path: /tmp/falco-images - name: Load all images From f48ed7e73a3920d492a1dd5b9d6873bb5f50c00f Mon Sep 17 00:00:00 2001 From: Aldo Lacuku Date: Tue, 21 Jan 2025 10:26:06 +0100 Subject: [PATCH 2/2] chore(falco.yaml): remove comments about cri cli arguments Signed-off-by: Aldo Lacuku --- falco.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/falco.yaml b/falco.yaml index 596bd9e1935..83df9bdd8f6 100644 --- a/falco.yaml +++ b/falco.yaml @@ -1330,8 +1330,6 @@ falco_libs: # - `container_engines.cri.disable_async`: Since API lookups may not always be quick or # perfect, resulting in empty fields for container metadata, you can use this option option # to disable asynchronous fetching. Note that missing fields may still occasionally occur. -# -# The equivalent (stable) CLI args are `--cri` or `--disable-cri-async`. container_engines: docker: