bitnami/compat - usrmerge usrsbin 3 (#48183)

Author: a-crate

kafka-4.0.yaml

@@ -1,7 +1,7 @@
 package:
   name: kafka-4.0
   version: "4.0.0"
-  epoch: 0
+  epoch: 40
   description: Apache Kafka is a distributed event streaming platform
   copyright:
     - license: Apache-2.0
@@ -10,7 +10,9 @@ package:
       - kafka=${{package.full-version}}
     runtime:
       - bash # some helper scripts use bash
+      - merged-usrsbin
       - openjdk-17-default-jvm
+      - wolfi-baselayout
 
 var-transforms:
   - from: ${{package.version}}
@@ -62,7 +64,9 @@ subpackages:
       provides:
         - kafka-bitnami-compat=${{package.full-version}}
       runtime:
+        - merged-usrsbin
         - wait-for-port
+        - wolfi-baselayout
     pipeline:
       - uses: bitnami/compat
         with:

keycloak-config-cli.yaml

@@ -1,13 +1,15 @@
 package:
   name: keycloak-config-cli
   version: 6.4.0
-  epoch: 3
+  epoch: 40
   description: Import YAML/JSON-formatted configuration files into Keycloak - Configuration as Code for Keycloak.
   copyright:
     - license: Apache-2.0
   dependencies:
     runtime:
+      - merged-usrsbin
       - openjdk-21-jre
+      - wolfi-baselayout
 
 # 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.
@@ -73,6 +75,10 @@ subpackages:
     test:
       pipeline:
         - runs: stat /app/${{package.name}}.jar | grep "/usr/share/java/${{package.name}}/${{package.name}}.jar"
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: ${{package.name}}-bitnami-compat
     description: Compat package with bitnami/keycloak-config-cli image
@@ -161,6 +167,10 @@ subpackages:
               --keycloak.user=${KC_BOOTSTRAP_ADMIN_USERNAME} \
               --keycloak.password=${KC_BOOTSTRAP_ADMIN_PASSWORD} \
               --import.files.locations=/home/build/moped.json
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
 test:
   environment:

memcached-exporter.yaml

@@ -1,10 +1,14 @@
 package:
   name: memcached-exporter
   version: "0.15.2"
-  epoch: 0
+  epoch: 40
   description: Exports metrics from memcached servers for consumption by Prometheus.
   copyright:
     - license: Apache-2.0
+  dependencies:
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -43,6 +47,10 @@ subpackages:
         - runs: |
             run-script --version
             run-script --help
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
 update:
   enabled: true

memcached.yaml

@@ -1,10 +1,14 @@
 package:
   name: memcached
   version: "1.6.38"
-  epoch: 1
+  epoch: 40
   description: "Distributed memory object caching system"
   copyright:
     - license: BSD-3-Clause
+  dependencies:
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -52,6 +56,8 @@ subpackages:
     dependencies:
       runtime:
         - memcached
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "memcached-doc"
     description: "memcached manpages"
@@ -60,12 +66,18 @@ subpackages:
     test:
       pipeline:
         - uses: test/docs
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: memcached-bitnami-compat
     description: "compat package with bitnami/memcached image"
     dependencies:
       runtime:
         - bash
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - uses: bitnami/compat
         with: