bitnami/compat - usrmerge usrsbin 4 (#48184)

Signed-off-by: Amelia Crate <[email protected]>
Co-authored-by: zach-marano <[email protected]>
Co-authored-by: Dimitri John Ledkov <[email protected]>

Author: 3 people

clickhouse-25.2.yaml

@@ -1,7 +1,7 @@
 package:
   name: clickhouse-25.2
   version: "25.2.2.39"
-  epoch: 2
+  epoch: 40
   description: ClickHouse is the fastest and most resource efficient open-source database for real-time apps and analytics.
   copyright:
     - license: Apache-2.0
@@ -11,6 +11,9 @@ package:
   dependencies:
     provides:
       - clickhouse=${{package.full-version}}
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -75,13 +78,21 @@ subpackages:
     description: "headers for clickhouse"
     pipeline:
       - uses: split/dev
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "${{package.name}}-bash-completion"
     description: "bash completion for clickhouse"
     pipeline:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/usr/share/bash-completion/completions
           mv ${{targets.destdir}}/usr/share/bash-completion/completions/clickhouse ${{targets.subpkgdir}}/usr/share/bash-completion/completions
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "${{package.name}}-compat"
     description: "docker compat for clickhouse"
@@ -91,6 +102,10 @@ subpackages:
           install -Dm755 ../docker/server/entrypoint.sh ${{targets.subpkgdir}}/entrypoint.sh
           mkdir -p ${{targets.subpkgdir}}/etc/clickhouse-server/config.d/
           cp  ../docker/server/docker_related_config.xml ${{targets.subpkgdir}}/etc/clickhouse-server/config.d/docker_related_config.xml
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: ${{package.name}}-bitnami-compat
     dependencies:
@@ -100,6 +115,8 @@ subpackages:
         - bash
         - busybox
         - coreutils
+        - merged-usrsbin
+        - wolfi-baselayout
         - xmlstarlet
     pipeline:
       - uses: bitnami/compat

influxd.yaml

@@ -5,10 +5,14 @@ package:
   # a commit which will fix it but it is not released yet.
   # So, for the next bump, please remove the `rust=1.82.0` pinning.
   version: 2.7.11
-  epoch: 9
+  epoch: 40
   description: Scalable datastore for metrics, events, and real-time analytics
   copyright:
     - license: MIT
+  dependencies:
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -67,8 +71,10 @@ subpackages:
           mv entrypoint.sh ${{targets.subpkgdir}}/usr/bin/
     dependencies:
       runtime:
-        - busybox
         - bash
+        - busybox
+        - merged-usrsbin
+        - wolfi-baselayout
         - yq
 
   - name: ${{package.name}}-bitnami-compat
@@ -79,13 +85,15 @@ subpackages:
         - coreutils
         - curl
         - findutils
-        - influxd
-        - influx
         - grep
+        - influx
+        - influxd
         - libgcc
+        - merged-usrsbin
         - procps
         - sed
         - wait-for-port # used in /opt/bitnami/scripts/libinfluxdb.sh
+        - wolfi-baselayout
     pipeline:
       - uses: bitnami/compat
         with:

ingress-nginx-controller-1.12.yaml

@@ -3,7 +3,7 @@ package:
   name: ingress-nginx-controller-1.12
   version: 1.12.1
   # There are manual changes to review between each package update. See 'vars:' section
-  epoch: 18
+  epoch: 40
   description: "Ingress-NGINX Controller for Kubernetes"
   copyright:
     - license: Apache-2.0
@@ -14,18 +14,16 @@ package:
     provides:
       - ingress-nginx-controller=${{package.full-version}}
     runtime:
-      - ca-certificates-bundle
+      - brotli
       - ca-certificates
+      - ca-certificates-bundle
       - curl
       - dumb-init-privileged-netbindservice
-      - openssh-client
-      - openssl
-      - openssl-dev
+      - gd
       - libcrypt1
-      - msgpack
-      - yaml-cpp
-      - ssdeep
-      - luajit
+      - libmaxminddb
+      - libxml2
+      - libxslt
       - lua-cjson
       - lua-resty-balancer
       - lua-resty-cache
@@ -40,14 +38,18 @@ package:
       - lua-resty-redis
       - lua-resty-string
       - lua-resty-upload
-      - brotli
-      - gd
-      - libmaxminddb
-      - libxml2
-      - libxslt
-      - modsecurity
+      - luajit
+      - merged-usrsbin
       - mimalloc
+      - modsecurity
+      - msgpack
+      - openssh-client
+      - openssl
+      - openssl-dev
       - pcre
+      - ssdeep
+      - wolfi-baselayout
+      - yaml-cpp
 
 var-transforms:
   - from: ${{package.version}}
@@ -525,10 +527,12 @@ subpackages:
         - librtmp
         - libssh
         - libtasn1
+        - merged-usrsbin
         - nettle
         - p11-kit
         - procps
         - sed
+        - wolfi-baselayout
     pipeline:
       - uses: bitnami/compat
         with:
@@ -577,7 +581,9 @@ subpackages:
         - ingress-nginx-controller-compat=${{package.full-version}}
       runtime:
         - ingress-nginx-opentelemetry-plugin-${{vars.nginx-ingress-major-minor}}
+        - merged-usrsbin
         - modsecurity-config
+        - wolfi-baselayout
     pipeline:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/usr/local/bin
@@ -612,6 +618,9 @@ subpackages:
     dependencies:
       provides:
         - kube-webhook-certgen=${{package.full-version}}
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - uses: go/build
         with:
@@ -626,7 +635,9 @@ subpackages:
       runtime:
         - grpc~1.70.1-r2 # This is temporary, due to Otel proto files incompatibility with our 3.29.4 version of protobuf
         - libprotobuf~3.29.3 # This is temporary, due to Otel proto files incompatibility with our 3.29.4 version of protobuf
+        - merged-usrsbin
         - so:libprotobuf.so.29.3.0 # This is temporary, due to Otel proto files incompatibility with our 3.29.4 version of protobuf
+        - wolfi-baselayout
       provides:
         - ingress-nginx-opentelemetry-plugin=${{package.full-version}}
     pipeline:
@@ -663,6 +674,9 @@ subpackages:
     dependencies:
       provides:
         - ingress-nginx-custom-error-pages=${{package.full-version}}
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - working-directory: images/custom-error-pages/rootfs/
         pipeline:
@@ -719,6 +733,9 @@ subpackages:
     dependencies:
       provides:
         - ingress-nginx-custom-error-pages-compat=${{package.full-version}}
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - working-directory: images/custom-error-pages/rootfs/
         pipeline:

nginx-prometheus-exporter.yaml

@@ -1,10 +1,14 @@
 package:
   name: nginx-prometheus-exporter
   version: "1.4.1"
-  epoch: 7
+  epoch: 40
   description: NGINX Prometheus Exporter for NGINX and NGINX Plus
   copyright:
     - license: Apache-2.0
+  dependencies:
+    runtime:
+      - merged-usrsbin
+      - 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.
@@ -78,6 +82,10 @@ subpackages:
                 test "$(readlink /opt/bitnami/nginx-exporter/bin/nginx-prometheus-exporter)" = "/usr/bin/nginx-prometheus-exporter"
                 test "$(readlink /usr/bin/exporter)" = "/usr/bin/nginx-prometheus-exporter"
             - runs: /opt/bitnami/nginx-exporter/bin/nginx-prometheus-exporter --version
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
 update:
   enabled: true