From ad4e41a8f781b0960a897f996e6c00c6f3541fcf Mon Sep 17 00:00:00 2001
From: Dentrax <furkan.turkal@chainguard.dev>
Date: Fri, 17 Jan 2025 21:31:27 +0300
Subject: [PATCH] fix(logstash-8): bitnami build issue and missing deps

Signed-off-by: Dentrax <furkan.turkal@chainguard.dev>
---
 logstash-8.yaml | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/logstash-8.yaml b/logstash-8.yaml
index aec3aae89f1..57fcb0fbb89 100644
--- a/logstash-8.yaml
+++ b/logstash-8.yaml
@@ -17,7 +17,7 @@
 package:
   name: logstash-8
   version: 8.17.0
-  epoch: 0
+  epoch: 1
   description: Logstash - transport and process your logs, events, or other data
   copyright:
     - license: Apache-2.0
@@ -28,7 +28,8 @@ package:
     runtime:
       - bash # some helper scripts use bash and busybox utilities
       - busybox
-      - openjdk-17-default-jvm
+      - openjdk-17
+      - openjdk-17-default-jdk
 
 # Create a new major-version variable that contains only the major version
 # to use in the bitnami/compat pipeline to find out the correct folder for the image.
@@ -43,16 +44,24 @@ environment:
   contents:
     packages:
       - bash
-      - busybox
       - ca-certificates-bundle
+      - coreutils
       - curl
+      - findutils
+      - glibc-locale-en
+      - glibc-locales
       - gradle
+      - grep
       - jq
       - jruby-9.4
       - logstash-filter-xml
       - logstash-integration-jdbc
       - logstash-output-opensearch
+      - net-tools
       - openjdk-17-default-jdk
+      - posix-libc-utils
+      - sed
+      - yq
   environment:
     OSS: "true"
     LOGSTASH_SOURCE: "1"
@@ -178,20 +187,25 @@ subpackages:
       runtime:
         - bash # some helper scripts use bash and busybox utilities
         - busybox
-        - yq
+        - coreutils
+        - findutils
         - posix-libc-utils # Required for getent
-        - openjdk-17-jre
-        - openjdk-17-default-jvm
+        - glibc-locales
+        - glibc-locale-en
+        - net-tools
+        - sed
+        - grep
+        - yq
     pipeline:
       - uses: bitnami/compat
         with:
           image: logstash
           version-path: ${{vars.major-version}}/debian-12
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/opt/bitnami/logstash
-          mkdir -p ${{targets.subpkgdir}}/opt/bitnami/scripts/logstash/
-
-          chmod g+rwX ${{targets.subpkgdir}}/opt/bitnami
+          mkdir -p ${{targets.contextdir}}/opt/bitnami/logstash
+          mkdir -p ${{targets.contextdir}}/opt/bitnami/logstash/pipeline
+          mkdir -p ${{targets.contextdir}}/opt/bitnami/scripts/logstash/
+          mkdir -p ${{targets.contextdir}}/opt/bitnami/logstash/config/./
 
           src=docker/data/logstash
           dst="${{targets.contextdir}}/opt/bitnami/logstash"
@@ -228,9 +242,6 @@ subpackages:
           # Restore path
           find ${{targets.contextdir}}/opt/bitnami -type f -exec sed 's#${{targets.contextdir}}##g' -i {} \;
 
-          chmod -R u+rwX,g+rwX,o+rw ${{targets.subpkgdir}}/opt/bitnami/
-          find / -perm /6000 -type f -exec chmod a-s {} \; || true
-
           # Link binaries used by Bitnami config
           ln -sf /opt/bitnami/scripts/logstash/entrypoint.sh ${{targets.contextdir}}/entrypoint.sh
           ln -sf /opt/bitnami/scripts/logstash/run.sh ${{targets.contextdir}}/run.sh
@@ -250,6 +261,11 @@ subpackages:
           # also have a custom logstash.yml
           rm "${{targets.subpkgdir}}"/opt/bitnami/logstash/config.default/logstash.yml
           install -Dm755 logstash.custom.yml "${{targets.subpkgdir}}"/opt/bitnami/logstash/config.default/logstash.yml
+      - runs: |
+          find "${{targets.contextdir}}/opt/bitnami" \
+            -path "${{targets.contextdir}}/opt/bitnami/logstash/vendor" -prune -o \
+            -exec chmod u+rwX,g+rwX,o+rw {} \;
+          find / -perm /6000 -type f -exec chmod a-s {} \; || true
     test:
       environment:
         contents:
@@ -257,7 +273,6 @@ subpackages:
             - bash
             - curl
             - busybox
-            - openjdk-17-default-jvm
         accounts:
           groups:
             - groupname: logstash