From 0c5d76ed7345dce08ced61daba2878e5f5cf5779 Mon Sep 17 00:00:00 2001
From: Mauro Ezequiel Moltrasio <mmoltras@redhat.com>
Date: Wed, 4 Dec 2024 18:36:01 +0100
Subject: [PATCH] Add inotify-tools, tree-sitter and install my scripts

---
 collector/Containerfile  | 10 +++++--
 falco-libs/Containerfile | 63 +++++++++++++++++++++++-----------------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/collector/Containerfile b/collector/Containerfile
index c667a97..5c14dcd 100644
--- a/collector/Containerfile
+++ b/collector/Containerfile
@@ -3,23 +3,29 @@ FROM quay.io/stackrox-io/collector-builder:master
 RUN dnf install -y epel-release && \
     dnf install -y \
         ccache \
-        clang-tools-extra \
         clang-analyzer \
+        clang-tools-extra \
         fzf \
+        inotify-tools \
         podman-docker \
         zsh && \
     dnf clean all && \
-    echo 'export MAKEFLAGS="-j$(nproc)"' >> /root/.bashrc && \
     # Clone my configuration
     git clone https://github.com/molter73/dotfiles "${HOME}/.config" && \
     # Install NeoVim
     curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz && \
     tar -C /opt -xzf nvim-linux64.tar.gz && \
     rm -f nvim-linux64.tar.gz && \
+    # Install tree-sitter
+    curl -LO https://github.com/tree-sitter/tree-sitter/releases/latest/download/tree-sitter-linux-x64.gz && \
+    gunzip -c tree-sitter-linux-x64.gz > /usr/local/bin/tree-sitter && \
+    chmod +x /usr/local/bin/tree-sitter && \
+    rm -f tree-sitter-linux-x64.gz && \
     # Install starship.rs
     curl -sS https://starship.rs/install.sh | sh -s -- --yes && \
     # Install my configuration
     "${HOME}/.config/zsh/install.sh" && \
+    "${HOME}/.config/scripts/install.sh" && \
     /opt/nvim-linux64/bin/nvim --headless "+Lazy! restore" +qa
 
 COPY clangd.yaml /root/.config/clangd/config.yaml
diff --git a/falco-libs/Containerfile b/falco-libs/Containerfile
index c3b7885..0ea1bb3 100644
--- a/falco-libs/Containerfile
+++ b/falco-libs/Containerfile
@@ -1,51 +1,53 @@
 FROM fedora:41
 
 RUN dnf install -y \
+    autoconf \
+    automake \
+    bpftool \
+    ccache \
+    clang \
+    cmake \
+    diffutils \
+    dnf-plugins-core \
+    elfutils-libelf-devel \
+    fzf \
     gcc \
     gcc-c++ \
-    ccache \
+    git \
+    inotify-tools \
+    kmod \
     libasan \
-    libubsan \
-    bpftool \
     libbpf-devel \
-    dnf-plugins-core \
-    git \
+    libtool \
+    libubsan \
     make \
-    cmake \
-    autoconf \
-    automake \
-    pkg-config \
-    patch \
     ncurses-devel \
-    libtool \
-    elfutils-libelf-devel \
-    diffutils \
-    which \
+    patch \
     perl-core \
-    clang \
-    procps \
-    python3-pip \
-    kmod \
-    fzf \
+    pkg-config \
     podman \
     podman-docker \
+    procps \
+    python3-pip \
+    wget \
+    which \
     zsh \
 # Debugging packages
-    gdb \
     clang-analyzer \
     clang-tools-extra \
+    gdb \
 # Dependencies for falcosecurity/testing
     golang \
 # Dependencies needed to build falcosecurity/libs.
-    libb64-devel \
     c-ares-devel \
-    libcurl.x86_64 \
-    libcurl-devel.x86_64 \
     grpc-cpp \
     grpc-devel \
     grpc-plugins \
     jq-devel \
     jsoncpp-devel \
+    libb64-devel \
+    libcurl-devel.x86_64 \
+    libcurl.x86_64 \
     openssl-devel \
     tbb-devel \
     xz \
@@ -61,16 +63,23 @@ RUN dnf install -y \
     ./emsdk activate latest && \
     echo 'export EMSDK_QUIET=1' >> /root/.bashrc && \
     echo 'source /emsdk/emsdk_env.sh' >> /root/.bashrc && \
-# Clone my configuration
+    # Install my dev environment
+    # Clone my configuration
     git clone https://github.com/molter73/dotfiles "${HOME}/.config" && \
-# Install NeoVim
+    # Install NeoVim
     curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz && \
     tar -C /opt -xzf nvim-linux64.tar.gz && \
     rm -f nvim-linux64.tar.gz && \
-# Install starship.rs
+    # Install tree-sitter
+    curl -LO https://github.com/tree-sitter/tree-sitter/releases/latest/download/tree-sitter-linux-x64.gz && \
+    gunzip -c tree-sitter-linux-x64.gz > /usr/local/bin/tree-sitter && \
+    chmod +x /usr/local/bin/tree-sitter && \
+    rm -f tree-sitter-linux-x64.gz && \
+    # Install starship.rs
     curl -sS https://starship.rs/install.sh | sh -s -- --yes && \
-# Install my configuration
+    # Install my configuration
     "${HOME}/.config/zsh/install.sh" && \
+    "${HOME}/.config/scripts/install.sh" && \
     /opt/nvim-linux64/bin/nvim --headless "+Lazy! restore" +qa
 
 COPY clangd.yaml /root/.config/clangd/config.yaml