Simplfy the package

Signed-off-by: Furkan Türkal <furkan.turkal@chainguard.dev>

Author: Dentrax

aws-for-fluent-bit.yaml

@@ -12,32 +12,13 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
-      - glibc
-      - glibc-dev
-      - yaml-dev
-      - gcc
-      - cmake
-      - make
-      - wget
-      - gnutar
-      - git
-      - openssl-dev
-      - cyrus-sasl-dev
-      - pkgconf
-      - dpkg
-      - systemd-dev
-      - zlib-dev
-      - flex
-      - bison
-      - autoconf
-      - automake
       - go
+      - fluent-bit
       - aws-flb-kinesis-compat
       - aws-flb-firehose-compat
       - aws-flb-cloudwatch-compat
 
 vars:
-  FLB_VERSION: "1.9.10"
   FLB_DOCKER_BRANCH: "1.8"
 
 pipeline:
@@ -48,17 +29,13 @@ pipeline:
       tag: v${{package.version}}
 
   - runs: |
-      # GHSA-p782-xgp4-8hr8
-      go get -u golang.org/x/sys@v0.0.0-20220412211240-33da011f77ad
-
-      go mod tidy
-
-  - runs: |
+      mkdir -p "${{targets.destdir}}"/etc/ecs
       mkdir -p "${{targets.destdir}}"/etc/fluent-bit/etc
       mkdir -p "${{targets.destdir}}"/etc/fluent-bit/parsers
+      cp -r ./ecs/* ${{targets.destdir}}/etc/ecs
       cp fluent-bit.conf "${{targets.destdir}}"/etc/fluent-bit/etc/
-      cp AWS_FLB_CHERRY_PICKS "${{targets.destdir}}"/etc/fluent-bit/AWS_FLB_CHERRY_PICKS
       cp ./entrypoint.sh "${{targets.destdir}}"/etc/fluent-bit/entrypoint.sh
+      cp AWS_FOR_FLUENT_BIT_VERSION "${{targets.destdir}}"/etc/fluent-bit/AWS_FOR_FLUENT_BIT_VERSION
       chmod +x "${{targets.destdir}}"/etc/fluent-bit/entrypoint.sh
 
   - runs: |
@@ -82,38 +59,6 @@ pipeline:
           cp conf/parsers*.conf "${{targets.destdir}}"/etc/fluent-bit/etc
           cp conf/parsers*.conf "${{targets.destdir}}"/etc/fluent-bit/parsers/
 
-  - working-directory: fluent-bit
-    pipeline:
-      - uses: git-checkout
-        with:
-          repository: https://github.com/fluent/fluent-bit.git
-          tag: v${{vars.FLB_VERSION}}
-          expected-commit: 760956f50cdc7eef3047df20d2299202a8c68594
-      - runs: |
-          cd build
-
-          # We remove fortify when building the libraries
-          export CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
-          export CPPFLAGS=${CPPFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
-          export CXXFLAGS=${CXXFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
-
-          cmake -DFLB_RELEASE=On \
-            -DCMAKE_INSTALL_PREFIX=/usr \
-            -DCMAKE_INSTALL_LIBDIR=lib \
-            -DFLB_TRACE=Off \
-            -DFLB_JEMALLOC=On \
-            -DFLB_TLS=On \
-            -DFLB_SHARED_LIB=Off \
-            -DFLB_EXAMPLES=Off \
-            -DFLB_HTTP_SERVER=On \
-            -DFLB_IN_SYSTEMD=On \
-            -DFLB_OUT_KAFKA=On \
-            -DFLB_ARROW=On \
-          ..
-          make
-      - runs: |
-          make -C build DESTDIR="${{targets.destdir}}" install
-
   - uses: strip
 
 subpackages:
@@ -122,10 +67,12 @@ subpackages:
     pipeline:
       - runs: |
           # The AWS for Fluent Bit expects the .so libraries to be in /fluent-bit
+          mkdir -p "${{targets.subpkgdir}}"/fluent-bit
           mkdir -p "${{targets.subpkgdir}}"/fluent-bit/bin
-          mkdir -p "${{targets.subpkgdir}}"/fluent-bit/etc
-          ln -sf /usr/bin/fluent-bit/bin/fluent-bit ${{targets.subpkgdir}}/fluent-bit/bin/fluent-bit
-          ln -sf /usr/bin/fluent-bit/etc/fluent-bit.conf ${{targets.subpkgdir}}/fluent-bit/etc/fluent-bit.conf
+          mkdir -p "${{targets.subpkgdir}}"/ecs
+          ln -sf /etc/ecs ${{targets.subpkgdir}}/ecs
+          ln -sf /etc/fluent-bit/ ${{targets.subpkgdir}}/fluent-bit/
+          ln -sf /usr/bin/fluent-bit ${{targets.subpkgdir}}/fluent-bit/bin/fluent-bit
       - uses: strip
 
 update: