wolfi: cadvisor entrypoint

dev/oci_deps.bzl

@@ -40,7 +40,7 @@ def oci_deps():
 
     oci_pull(
         name = "wolfi_cadvisor_base",
-        digest = "sha256:42e9626596c7e3873f9ea66b87732273bc93f20d05499d410160468f40d585f5",
+        digest = "sha256:39f800ff006bbe579c71eaecc0157d5a57c7e2c0b11ba7a262eb8aec9fd848e0",
         image = "index.docker.io/sourcegraph/wolfi-cadvisor-base",
     )
 

docker-images/cadvisor/BUILD.bazel

@@ -1,24 +1,28 @@
 load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push", "oci_tarball")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:oci_defs.bzl", "image_repository")
+load("@rules_pkg//:pkg.bzl", "pkg_tar")
+
+filegroup(
+    name = "cadvisor_entrypoint",
+    srcs = ["entrypoint.sh"],
+)
+
+pkg_tar(
+    name = "tar_cadvisor",
+    srcs = [
+        ":cadvisor_entrypoint",
+    ],
+    remap_paths = {
+        "/entrypoint.sh": "/usr/bin/entrypoint.sh",
+    },
+)
 
 oci_image(
     name = "image",
     base = "@wolfi_cadvisor_base",
-    cmd = ["--sampling.strategies-file=/etc/jaeger/sampling_strategies.json"],
-    entrypoint = [
-        "/usr/bin/cadvisor",
-        "-logtostderr",
-        "-port=48080",
-        "-enable_metrics=cpu,diskIO,memory,network",
-        "-docker_only",
-        "-housekeeping_interval=10s",
-        "-max_housekeeping_interval=15s",
-        "-event_storage_event_limit=default=0",
-        "-v=3",
-        "-event_storage_age_limit=default=0",
-        "-containerd=/var/run/containerd/containerd.sock",
-    ],
+    entrypoint = ["/usr/bin/entrypoint.sh"],
+    tars = [":tar_cadvisor"],
 )
 
 oci_tarball(

docker-images/cadvisor/entrypoint.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+/usr/bin/cadvisor \
+  -enable_metrics=cpu,memory,disk,network \
+  -logtostderr \
+  -port=48080 \
+  -docker_only \
+  -housekeeping_interval=10s \
+  -max_housekeeping_interval=15s \
+  -event_storage_event_limit=default=0 \
+  -v=3 \
+  -event_storage_age_limit=default=0 \
+  -containerd=/var/run/containerd/containerd.sock

wolfi-images/cadvisor.yaml

@@ -9,4 +9,4 @@ contents:
     ## cadvisor dependencies
     - cadvisor
 
-# MANUAL REBUILD: Thu Jun 22 13:43:35 BST 2023
+# MANUAL REBUILD: Wed Jul 12 08:42:56 -05 2023