chore: updates mods

.github/ISSUE_TEMPLATE/0_bug_report.yml

@@ -48,18 +48,17 @@ body:
     id: environment
     attributes:
       label: 💻 Environment
-      description: Run `docker system info` and paste the output in the field below.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 📜 Dozzle logs are required for debugging purposes. You may need to enable debug mode. See https://dozzle.dev/guide/debugging.
-      description: Drag log files or paste the logs into the text input below
+      description: Run `docker system info` and paste the output in the field below..
     validations:
       required: true
   - type: textarea
     attributes:
       label: 📸 If applicable, add screenshots to help explain your bug
-      description: Drag screenshots into the text input below
+      description: Drag issues into the text input below
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: 📜 If applicable, attach your Dozzle logs. You many need to enable debug mode. See https://dozzle.dev/guide/debugging.
     validations:
       required: false

.github/workflows/deploy.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.24.2
+          go-version: 1.22.x
           check-latest: true
       - name: Checkout code
         uses: actions/checkout@v4
@@ -92,12 +92,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
       - name: Login to DockerHub
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the Container registry
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/dev.yml

@@ -15,12 +15,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
       - name: Login to DockerHub
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the Container registry
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/test.yml

@@ -54,7 +54,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.24.2"
+          go-version: "1.23"
           check-latest: true
       - name: Checkout code
         uses: actions/checkout@v4
@@ -77,7 +77,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.24.2"
+          go-version: "1.24"
           check-latest: true
       - name: Generate dependencies
         run: make fake_assets shared_key.pem shared_cert.pem

Dockerfile

@@ -1,5 +1,5 @@
 # Build assets
-FROM --platform=$BUILDPLATFORM node:23.11.0-alpine AS node
+FROM --platform=$BUILDPLATFORM node:23.9.0-alpine AS node
 
 RUN corepack enable
 

README.md

@@ -115,7 +115,26 @@ If you do not want to be tracked at all, see the `--no-analytics` flag below.
 
 ## Environment variables and configuration
 
-Dozzle follows the [12-factor](https://12factor.net/) model. Configurations can use the CLI flags or environment variables. See documentation at [https://dozzle.dev/guide/supported-env-vars](https://dozzle.dev/guide/supported-env-vars) for more details.
+Dozzle follows the [12-factor](https://12factor.net/) model. Configurations can use the CLI flags or environment variables. The table below outlines all supported options and their respective env vars.
+
+| Flag                  | Env Variable               | Default        |
+| --------------------- | -------------------------- | -------------- |
+| `--addr`              | `DOZZLE_ADDR`              | `:8080`        |
+| `--base`              | `DOZZLE_BASE`              | `/`            |
+| `--hostname`          | `DOZZLE_HOSTNAME`          | `""`           |
+| `--level`             | `DOZZLE_LEVEL`             | `info`         |
+| `--auth-provider`     | `DOZZLE_AUTH_PROVIDER`     | `none`         |
+| `--auth-header-user`  | `DOZZLE_AUTH_HEADER_USER`  | `Remote-User`  |
+| `--auth-header-email` | `DOZZLE_AUTH_HEADER_EMAIL` | `Remote-Email` |
+| `--auth-header-name`  | `DOZZLE_AUTH_HEADER_NAME`  | `Remote-Name`  |
+| `--enable-actions`    | `DOZZLE_ENABLE_ACTIONS`    | `false`        |
+| `--filter`            | `DOZZLE_FILTER`            | `""`           |
+| `--no-analytics`      | `DOZZLE_NO_ANALYTICS`      | `false`        |
+| `--mode`              | `DOZZLE_MODE`              | `server`       |
+| `--remote-host`       | `DOZZLE_REMOTE_HOST`       |                |
+| `--remote-agent`      | `DOZZLE_REMOTE_AGENT`      |                |
+| `--timeout`           | `DOZZLE_TIMEOUT`           | `10s`          |
+| `--namespace`         | `DOZZLE_NAMESPACE`         | `""`           |
 
 ## Support
 

assets/App.vue

@@ -15,7 +15,6 @@ watchEffect(() => {
   if (theme === "auto") {
     theme = mode.value;
   }
-  document.querySelector('meta[name="theme-color"]')?.setAttribute("content", theme == "dark" ? "#121212" : "#F5F5F5");
   document.documentElement.setAttribute("data-theme", theme);
 });
 </script>

assets/auto-imports.d.ts

@@ -31,7 +31,6 @@ declare global {
   const createInjectionState: typeof import('@vueuse/core')['createInjectionState']
   const createPinia: typeof import('pinia')['createPinia']
   const createReactiveFn: typeof import('@vueuse/core')['createReactiveFn']
-  const createRef: typeof import('@vueuse/core')['createRef']
   const createReusableTemplate: typeof import('@vueuse/core')['createReusableTemplate']
   const createSharedComposable: typeof import('@vueuse/core')['createSharedComposable']
   const createTemplatePromise: typeof import('@vueuse/core')['createTemplatePromise']
@@ -422,7 +421,6 @@ declare module 'vue' {
     readonly createInjectionState: UnwrapRef<typeof import('@vueuse/core')['createInjectionState']>
     readonly createPinia: UnwrapRef<typeof import('pinia')['createPinia']>
     readonly createReactiveFn: UnwrapRef<typeof import('@vueuse/core')['createReactiveFn']>
-    readonly createRef: UnwrapRef<typeof import('@vueuse/core')['createRef']>
     readonly createReusableTemplate: UnwrapRef<typeof import('@vueuse/core')['createReusableTemplate']>
     readonly createSharedComposable: UnwrapRef<typeof import('@vueuse/core')['createSharedComposable']>
     readonly createTemplatePromise: UnwrapRef<typeof import('@vueuse/core')['createTemplatePromise']>

assets/components.d.ts

@@ -62,7 +62,6 @@ declare module 'vue' {
     LogMessageActions: typeof import('./components/LogViewer/LogMessageActions.vue')['default']
     LogStd: typeof import('./components/LogViewer/LogStd.vue')['default']
     LogViewer: typeof import('./components/LogViewer/LogViewer.vue')['default']
-    'MaterialSymbols:terminal': typeof import('~icons/material-symbols/terminal')['default']
     'Mdi:account': typeof import('~icons/mdi/account')['default']
     'Mdi:announcement': typeof import('~icons/mdi/announcement')['default']
     'Mdi:arrowUp': typeof import('~icons/mdi/arrow-up')['default']
@@ -104,7 +103,6 @@ declare module 'vue' {
     'Ph:stackSimple': typeof import('~icons/ph/stack-simple')['default']
     Popup: typeof import('./components/Popup.vue')['default']
     RandomColorTag: typeof import('./components/LogViewer/RandomColorTag.vue')['default']
-    'Ri:terminalWindowFill': typeof import('~icons/ri/terminal-window-fill')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     ScrollableView: typeof import('./components/ScrollableView.vue')['default']
@@ -123,7 +121,6 @@ declare module 'vue' {
     StatSparkline: typeof import('./components/LogViewer/StatSparkline.vue')['default']
     SwarmMenu: typeof import('./components/SwarmMenu.vue')['default']
     Tag: typeof import('./components/common/Tag.vue')['default']
-    Terminal: typeof import('./components/Terminal.vue')['default']
     TimedButton: typeof import('./components/common/TimedButton.vue')['default']
     ToastModal: typeof import('./components/common/ToastModal.vue')['default']
     Toggle: typeof import('./components/common/Toggle.vue')['default']

assets/components/ContainerViewer/ContainerActionsToolbar.vue

@@ -134,22 +134,6 @@
           </button>
         </li>
       </template>
-
-      <template v-if="enableShell">
-        <li class="line"></li>
-        <li>
-          <a @click.prevent="showDrawer(Terminal, { container, action: 'attach' }, 'lg')">
-            <ri:terminal-window-fill /> Attach
-            <KeyShortcut char="a" :modifiers="['shift', 'meta']" />
-          </a>
-        </li>
-        <li>
-          <a @click.prevent="showDrawer(Terminal, { container, action: 'exec' }, 'lg')">
-            <material-symbols:terminal /> Shell
-            <KeyShortcut char="e" :modifiers="['shift', 'meta']" />
-          </a>
-        </li>
-      </template>
     </ul>
   </div>
 </template>
@@ -158,10 +142,9 @@
 import { Container } from "@/models/Container";
 import { allLevels } from "@/composable/logContext";
 import LogAnalytics from "../LogViewer/LogAnalytics.vue";
-import Terminal from "@/components/Terminal.vue";
 
 const { showSearch } = useSearchFilter();
-const { enableActions, enableShell } = config;
+const { enableActions } = config;
 const { streamConfig, hasComplexLogs, levels } = useLoggingContext();
 const showDrawer = useDrawer();
 
@@ -177,21 +160,6 @@ onKeyStroke("f", (e) => {
     }
   }
 });
-if (enableShell) {
-  onKeyStroke("a", (e) => {
-    if ((e.ctrlKey || e.metaKey) && e.shiftKey) {
-      showDrawer(Terminal, { container, action: "attach" }, "lg");
-      e.preventDefault();
-    }
-  });
-
-  onKeyStroke("e", (e) => {
-    if ((e.ctrlKey || e.metaKey) && e.shiftKey) {
-      showDrawer(Terminal, { container, action: "exec" }, "lg");
-      e.preventDefault();
-    }
-  });
-}
 
 const downloadParams = computed(() =>
   Object.entries(toValue(streamConfig))

assets/components/ContainerViewer/ContainerTitle.vue

@@ -62,9 +62,9 @@ const store = useContainerStore();
 const { containers: allContainers } = storeToRefs(store);
 
 const otherContainers = computed(() =>
-  allContainers.value
-    .filter((c) => c.name === container.name && c.id !== container.id)
-    .sort((a, b) => +b.created - +a.created),
+  [...allContainers.value.filter((c) => c.name === container.name && c.id !== container.id)].sort(
+    (a, b) => +b.created - +a.created,
+  ),
 );
 const wrapper = useTemplateRef("wrapper");
 

assets/components/FuzzySearchModal.spec.ts

@@ -42,8 +42,6 @@ function createFuzzySearchModal() {
                   "host",
                   {},
                   "running",
-                  0,
-                  0,
                   [],
                 ),
                 new Container(
@@ -57,8 +55,6 @@ function createFuzzySearchModal() {
                   "host",
                   {},
                   "running",
-                  0,
-                  0,
                   [],
                 ),
                 new Container(
@@ -72,8 +68,6 @@ function createFuzzySearchModal() {
                   "host",
                   {},
                   "running",
-                  0,
-                  0,
                   [],
                 ),
               ],

assets/components/HostList.vue

@@ -51,7 +51,7 @@
             :style="`--value: ${Math.floor((weightedStats[host.id].weighted.totalMem / host.memTotal) * 100)};`"
             role="progressbar"
           >
-            {{ formatBytes(weightedStats[host.id].weighted.totalMem, { decimals: 1, short: true }) }}
+            {{ formatBytes(weightedStats[host.id].weighted.totalMem, 1) }}
           </div>
         </div>
       </div>

assets/components/LogViewer/EventSource.spec.ts

@@ -105,8 +105,6 @@ describe("<ContainerEventSource />", () => {
           "localhost",
           {},
           "created",
-          0,
-          0,
           [],
         ),
       },

assets/components/LogViewer/LogDetails.vue

@@ -72,6 +72,7 @@
 
 <script setup lang="ts">
 import { ComplexLogEntry } from "@/models/LogEntry";
+import { useSortable } from "@vueuse/integrations/useSortable";
 import { UseClipboard } from "@vueuse/components";
 
 const { entry } = defineProps<{ entry: ComplexLogEntry }>();
@@ -81,8 +82,6 @@ const container = currentContainer(toRef(() => entry.containerID));
 const visibleKeys = persistentVisibleKeysForContainer(container);
 const { hosts } = useHosts();
 
-const { useSortable } = await import("@vueuse/integrations/useSortable");
-
 function toggleField(key: string[]) {
   if (visibleKeys.value.size === 0) {
     visibleKeys.value = new Map<string[], boolean>(fields.value.map(({ key }) => [key, true]));
@@ -147,8 +146,8 @@ function syntaxHighlight(json: any) {
     /("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|\b\d+\b)/g,
     function (match: string) {
       var cls = "json-number";
-      if (match.startsWith('"')) {
-        if (match.endsWith(":")) {
+      if (/^"/.test(match)) {
+        if (/:$/.test(match)) {
           cls = "json-key";
         } else {
           cls = "json-string";

assets/components/LogViewer/MultiContainerStat.vue

@@ -1,17 +1,7 @@
 <template>
   <div class="flex gap-4">
-    <StatMonitor
-      :data="memoryData"
-      label="mem"
-      :stat-value="formatBytes(totalStat.memoryUsage)"
-      :limit="formatBytes(limits.memory, { short: true, decimals: 1 })"
-    />
-    <StatMonitor
-      :data="cpuData"
-      label="load"
-      :stat-value="Math.max(0, totalStat.cpu).toFixed(2) + '%'"
-      :limit="roundCPU(limits.cpu) + ' CPU'"
-    />
+    <StatMonitor :data="memoryData" label="mem" :stat-value="formatBytes(totalStat.memoryUsage)" />
+    <StatMonitor :data="cpuData" label="load" :stat-value="Math.max(0, totalStat.cpu).toFixed(2) + '%'" />
   </div>
 </template>
 
@@ -25,9 +15,6 @@ const { containers } = defineProps<{
 
 const totalStat = ref<Stat>({ cpu: 0, memory: 0, memoryUsage: 0 });
 const { history, reset } = useSimpleRefHistory(totalStat, { capacity: 300 });
-const { hosts } = useHosts();
-
-const roundCPU = (num: number) => (Number.isInteger(num) ? num.toFixed(0) : num.toFixed(1));
 
 watch(
   () => containers,
@@ -55,16 +42,6 @@ watch(
   { immediate: true },
 );
 
-const limits = computed(() =>
-  containers.reduce(
-    (acc, c) => ({
-      cpu: acc.cpu + (c.cpuLimit > 0 ? c.cpuLimit : hosts.value[c.host].nCPU),
-      memory: acc.memory + (c.memoryLimit > 0 ? c.memoryLimit : hosts.value[c.host].memTotal),
-    }),
-    { cpu: 0, memory: 0 },
-  ),
-);
-
 useIntervalFn(() => {
   totalStat.value = containers.reduce(
     (acc, { stat }) => {

assets/components/LogViewer/SimpleLogItem.vue

@@ -29,7 +29,7 @@ defineProps<{
 
 const colorize = (value: string) => ansiConvertor.toHtml(value);
 const urlPattern =
-  /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b[-a-zA-Z0-9()@:%_+.~#?&/=]*/g;
+  /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b[-a-zA-Z0-9()@:%_+.~#?&\/=]*/g;
 const linkify = (text: string) =>
   text.replace(urlPattern, (url) => `<a href="${url}" target="_blank" rel="noopener noreferrer">${url}</a>`);
 </script>

assets/components/LogViewer/StatMonitor.vue

@@ -1,31 +1,25 @@
 <template>
   <div class="hover:text-secondary relative" @mouseenter="mouseOver = true" @mouseleave="mouseOver = false">
-    <div class="border-primary overflow-hidden rounded-xs border px-px pt-1 pb-px max-md:hidden">
+    <div class="border-primary hidden overflow-hidden rounded-xs border px-px pt-1 pb-px md:flex">
       <StatSparkline :data="data" @selected-point="onSelectedPoint" />
     </div>
     <div class="bg-base-200 inline-flex gap-1 rounded-sm p-px text-xs md:absolute md:-top-2 md:-left-0.5">
       <div class="font-light uppercase">{{ label }}</div>
       <div class="font-bold select-none">
         {{ mouseOver ? (selectedPoint?.value ?? selectedPoint?.y ?? statValue) : statValue }}
-        <span v-if="limit !== -1 && !mouseOver" class="max-md:hidden"> / {{ limit }} </span>
       </div>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-const {
-  data,
-  label,
-  statValue,
-  limit = -1,
-} = defineProps<{
-  data: Point<unknown>[];
-  label: string;
-  statValue: string | number;
-  limit?: string | number;
-}>();
-const selectedPoint = ref<Point<unknown> | undefined>();
-const onSelectedPoint = (point: Point<unknown>) => (selectedPoint.value = point);
-const mouseOver = ref(false);
+const { data, label, statValue } = defineProps<{ data: Point<unknown>[]; label: string; statValue: string | number }>();
+
+let selectedPoint: Point<unknown> | undefined = $ref();
+
+function onSelectedPoint(point: Point<unknown>) {
+  selectedPoint = point;
+}
+
+let mouseOver = $ref(false);
 </script>

assets/components/LogViewer/StatSparkline.vue

@@ -11,7 +11,7 @@ import { scaleLinear } from "d3-scale";
 import { area, curveStep } from "d3-shape";
 
 const d3 = { extent, scaleLinear, area, curveStep };
-const { data, width = 175, height = 30 } = defineProps<{ data: Point<unknown>[]; width?: number; height?: number }>();
+const { data, width = 150, height = 30 } = defineProps<{ data: Point<unknown>[]; width?: number; height?: number }>();
 const x = d3.scaleLinear().range([0, width]);
 const y = d3.scaleLinear().range([height, 0]);
 

assets/components/Terminal.vue

@@ -1,95 +0,0 @@
-<template>
-  <aside>
-    <header class="flex items-center gap-4">
-      <material-symbols:terminal class="size-8" />
-      <h1 class="text-2xl max-md:hidden">{{ container.name }}</h1>
-      <h2 class="text-sm">Started <DistanceTime :date="container.created" /></h2>
-    </header>
-
-    <div class="mt-8 flex flex-col gap-2">
-      <section>
-        <div ref="host" class="shell"></div>
-      </section>
-    </div>
-  </aside>
-</template>
-
-<script setup lang="ts">
-import { Container } from "@/models/Container";
-import "@xterm/xterm/css/xterm.css";
-const { container, action } = defineProps<{ container: Container; action: "attach" | "exec" }>();
-
-const { Terminal } = await import("@xterm/xterm");
-const { WebLinksAddon } = await import("@xterm/addon-web-links");
-
-const host = useTemplateRef<HTMLDivElement>("host");
-const terminal = new Terminal({
-  cursorBlink: true,
-  cursorStyle: "block",
-});
-terminal.loadAddon(new WebLinksAddon());
-
-let ws: WebSocket | null = null;
-
-onMounted(() => {
-  terminal.open(host.value!);
-  terminal.resize(100, 40);
-  ws = new WebSocket(withBase(`/api/hosts/${container.host}/containers/${container.id}/${action}`));
-  ws.onopen = () => {
-    terminal.writeln(`Attaching to ${container.name} 🚀`);
-    if (action === "attach") {
-      ws?.send("\r");
-    }
-    terminal.onData((data) => {
-      ws?.send(data);
-    });
-    terminal.focus();
-  };
-  ws.onmessage = (event) => terminal.write(event.data);
-  ws.addEventListener("close", () => {
-    terminal.writeln("⚠️ Connection closed");
-  });
-});
-
-onUnmounted(() => {
-  console.log("Closing WebSocket");
-  terminal.dispose();
-  ws?.close();
-});
-</script>
-<style scoped>
-@import "@/main.css" reference;
-
-.shell {
-  & :deep(.terminal) {
-    @apply overflow-hidden rounded border-1 p-2;
-    &:is(.focus) {
-      @apply border-primary;
-    }
-  }
-
-  & :deep(.xterm-viewport) {
-    @apply bg-base-200!;
-  }
-
-  & :deep(.xterm-rows) {
-    @apply text-base-content;
-  }
-
-  & :deep(.xterm-cursor-block.xterm-cursor-blink) {
-    animation-name: blink !important;
-  }
-}
-
-@keyframes blink {
-  0% {
-    background-color: var(--color-base-content);
-    color: #000000;
-  }
-
-  50% {
-    background-color: inherit;
-    color: var(--color-base-content);
-  }
-}
-</style>

assets/components/common/SideDrawer.vue

@@ -2,7 +2,7 @@
   <dialog ref="panel" class="modal-right modal items-start outline-hidden backdrop:bg-none">
     <div class="modal-box" :width="width">
       <form method="dialog">
-        <button class="swap hover:swap-active absolute top-4 right-4 outline-hidden">
+        <button class="swap swap-rotate hover:swap-active absolute top-4 right-4 outline-hidden">
           <mdi:keyboard-esc class="swap-off" />
           <mdi:close class="swap-on" />
         </button>

assets/composable/profileStorage.ts

@@ -29,7 +29,7 @@ export function useProfileStorage<K extends keyof Profile>(
     if (transformer) {
       storage.value = transformer.from(config.profile[key]);
     } else if (storage.value instanceof Set && config.profile[key] instanceof Array) {
-      storage.value = new Set(config.profile[key] as Iterable<any>) as unknown as NonNullable<Profile[K]>;
+      storage.value = new Set([...(config.profile[key] as Iterable<any>)]) as unknown as NonNullable<Profile[K]>;
     } else if (config.profile[key] instanceof Array) {
       storage.value = config.profile[key] as NonNullable<Profile[K]>;
     } else if (config.profile[key] instanceof Object) {

assets/layouts/default.vue

@@ -5,7 +5,7 @@
       <Pane min-size="10" :size="menuWidth" v-if="!isMobile && !collapseNav && !forceMenuHidden">
         <SidePanel @search="showFuzzySearch" />
       </Pane>
-      <Pane min-size="10" :size="100 - menuWidth">
+      <Pane min-size="10">
         <Splitpanes>
           <Pane class="router-view min-h-screen">
             <router-view></router-view>
@@ -34,7 +34,11 @@
       <mdi:chevron-left class="swap-off" />
     </label>
   </div>
-  <dialog ref="modal" class="modal items-start bg-white/15 backdrop-blur-xs transition-none!" @close="open = false">
+  <dialog
+    ref="modal"
+    class="modal items-start bg-white/20 transition-none backdrop:backdrop-blur-xs"
+    @close="open = false"
+  >
     <div class="modal-box max-w-2xl bg-transparent pt-20 shadow-none">
       <FuzzySearchModal @close="open = false" v-if="open" />
     </div>
@@ -87,9 +91,9 @@ function showFuzzySearch() {
   open.value = true;
 }
 
-function onResized({ panes }: { panes: { size: number }[] }) {
-  if (panes.length == 2) {
-    menuWidth.value = Math.min(panes[0].size, 50);
+function onResized(e: any) {
+  if (e.length == 2) {
+    menuWidth.value = e[0].size;
   }
 }
 </script>
@@ -98,7 +102,7 @@ function onResized({ panes }: { panes: { size: number }[] }) {
 @import "@/main.css" reference;
 
 :deep(.splitpanes--vertical > .splitpanes__splitter) {
-  @apply bg-base-100 hover:bg-secondary min-w-[5px];
+  @apply bg-base-100 hover:bg-secondary min-w-[3px];
 }
 
 @media screen and (max-width: 768px) {

assets/main.css

@@ -126,10 +126,3 @@
     }
   }
 }
-
-body {
-  padding-top: env(safe-area-inset-top);
-  padding-bottom: env(safe-area-inset-bottom);
-  padding-left: env(safe-area-inset-left);
-  padding-right: env(safe-area-inset-right);
-}

assets/models/Container.ts

@@ -38,8 +38,6 @@ export class Container {
     public readonly host: string,
     public readonly labels = {} as Record<string, string>,
     public state: ContainerState,
-    public readonly cpuLimit: number,
-    public readonly memoryLimit: number,
     stats: Stat[],
     public readonly group?: string,
     public health?: ContainerHealth,

assets/stores/config.ts

@@ -11,7 +11,6 @@ export interface Config {
   hosts: Host[];
   authProvider: "simple" | "none" | "forward-proxy";
   enableActions: boolean;
-  enableShell: boolean;
   user?: {
     username: string;
     email: string;

assets/stores/container.ts

@@ -154,8 +154,6 @@ export const useContainerStore = defineStore("container", () => {
           c.host,
           c.labels,
           c.state,
-          c.cpuLimit,
-          c.memoryLimit,
           c.stats,
           c.group,
           c.health,

assets/types/Container.d.ts

@@ -16,8 +16,6 @@ export type ContainerJson = {
   readonly status: string;
   readonly state: ContainerState;
   readonly host: string;
-  readonly cpuLimit: number;
-  readonly memoryLimit: number;
   readonly labels: Record<string, string>;
   readonly stats: ContainerStat[];
   readonly health?: ContainerHealth;

assets/utils/index.ts

@@ -1,19 +1,10 @@
-export function formatBytes(
-  bytes: number,
-  { decimals = 2, short = false }: { decimals?: number; short?: boolean } = { decimals: 2, short: false },
-) {
+export function formatBytes(bytes: number, decimals = 2) {
   if (bytes === 0) return "0 Bytes";
   const k = 1024;
   const dm = decimals < 0 ? 0 : decimals;
   const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
   const i = Math.floor(Math.log(bytes) / Math.log(k));
-
-  const value = parseFloat((bytes / Math.pow(k, i)).toFixed(dm));
-  if (short) {
-    return value + sizes[i].charAt(0);
-  } else {
-    return value + " " + sizes[i];
-  }
+  return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + " " + sizes[i];
 }
 
 export function getDeep(obj: Record<string, any>, path: string[]) {

docker-compose.yml

@@ -95,7 +95,7 @@ services:
 
   playwright:
     container_name: playwright
-    image: mcr.microsoft.com/playwright:v1.51.1-jammy
+    image: mcr.microsoft.com/playwright:v1.51.0-jammy
     working_dir: /app
     volumes:
       - .:/app

docs/.vitepress/config.ts

@@ -72,7 +72,6 @@ export default defineConfig({
         items: [
           { text: "Authentication", link: "/guide/authentication" },
           { text: "Actions", link: "/guide/actions" },
-          { text: "Shell Access", link: "/guide/shell" },
           { text: "Agent Mode", link: "/guide/agent" },
           { text: "Changing Base", link: "/guide/changing-base" },
           { text: "Container Names", link: "/guide/container-names" },

docs/guide/actions.md

@@ -4,7 +4,7 @@ title: Container Actions
 
 # Using Container Actions
 
-Dozzle supports container actions, which allows you to `start`, `stop` and `restart` containers from the dropdown menu on the right next to the container stats. This feature is **disabled** by default and can be enabled by setting the environment variable `DOZZLE_ENABLE_ACTIONS` to `true`.
+Dozzle supports Container Actions, which allows you to `start`, `stop` and `restart` containers from within the UI in the dropdown menu. This feature is **disabled** by default and can be enabled by setting the environment variable `DOZZLE_ENABLE_ACTIONS` to `true`.
 
 ::: code-group
 

docs/guide/agent.md

@@ -64,21 +64,10 @@ Note that when connecting remotely, you don't need to mount local Docker socket.
 > [!TIP]
 > You can connect to multiple agents by providing multiple `DOZZLE_REMOTE_AGENT` environment variables. For example, `DOZZLE_REMOTE_AGENT=agent1:7007,agent2:7007`.
 
-## Common Issues
+> [!WARNING]
+> Dozzle uses the Docker API to gather information about hosts. Each agent needs a unique host ID. They use Docker's system ID or node ID to identify the host. If you are using swarm, then the node ID is used. If you don't see all hosts, then you may have duplicate hosts configured that have the same host ID. To fix this, remove `/var/lib/docker/engine-id` file. See [FAQ](/guide/faq#i-am-seeing-duplicate-hosts-error-in-the-logs-how-do-i-fix-it) for more information.
 
-### Agent Not Showing Up
-
-If you are seeing `An agent with an existing ID was found. Removing the duplicate host.` then you have two hosts that use the same Server ID.
-
-Dozzle utilizes the Docker API to collect information about hosts. Each agent requires a unique host ID that remains consistent across restarts to ensure proper identification. Currently, agents identify the host using either Docker's system ID or node ID.
-
-If you are operating in a Swarm environment, the node ID will be employed for this purpose. However, if you notice that not all hosts are visible, it may be due to the presence of duplicate hosts configured with the same host ID.
-
-To resolve this issue, you should remove `/var/lib/docker/engine-id` from your system and restart. This action will help eliminate any conflicts caused by duplicate host IDs. For additional information and troubleshooting tips, please refer to the [FAQ](/guide/faq#i-am-seeing-duplicate-hosts-error-in-the-logs-how-do-i-fix-it).
-
-## Advanced Options
-
-### Setting Up Healthcheck
+## Setting Up Healthcheck
 
 You can set a healthcheck for the agent, similar to the healthcheck for the main Dozzle instance. When running in agent mode, healthcheck checks agent connection to Docker. If Docker is not reachable, the agent will be marked as unhealthy and will not be shown in the UI.
 
@@ -101,7 +90,7 @@ services:
       - 7007:7007
 ```
 
-### Changing Agent's Name
+## Changing Agent's Name
 
 Similar to Dozzle instance, you can change the agent's name by providing the `DOZZLE_HOSTNAME` environment variable. Here is an example:
 
@@ -128,7 +117,7 @@ services:
 
 This will change the agent's name to `my-special-name` and will be reflected on the UI when connecting to the agent.
 
-### Setting Up Filters
+## Setting Up Filters
 
 You can set up filters for the agent to limit the containers it can access. These filters are passed directly to Docker, restricting what Dozzle can view.
 
@@ -145,7 +134,7 @@ services:
 
 This will restrict the agent to displaying only containers with the label `color`. Keep in mind that these filters are combined with the UI filters to narrow down the containers. To learn more about the different types of filters, read the [filters documentation](/guide/filters#ui-agents-and-user-filters).
 
-### Custom Certificates
+## Custom Certificates
 
 By default, Dozzle uses self-signed certificates for communication between agents. This is a private certificate which is only valid to other Dozzle instances. This is secure and recommended for most use cases. However, if Dozzle is exposed externally and an attacker knows exactly which port the agent is running on, then they can set up their own Dozzle instance and connect to the agent. To prevent this, you can provide your own certificates.
 

docs/guide/authentication.md

@@ -10,11 +10,7 @@ If you do not have an authentication solution, then Dozzle has a simple file-bas
 
 ## File-Based User Management
 
-**Dozzle** supports multi-user authentication by setting `--auth-provider` to `simple`. In this mode, Dozzle will attempt to read the users file from `/data/`, prioritizing `users.yml` over `users.yaml` if both files are present. If only one of the files exists, it will be used. The log will indicate which file is being read (e.g., `Reading users.yml file`).
-
-### Example file paths:
-- `/data/users.yml`
-- `/data/users.yaml`
+Dozzle supports multi-user authentication by setting `--auth-provider` to `simple`. In this mode, Dozzle will try to read `/data/users.yml`.
 
 The content of the file looks like:
 

docs/guide/changing-base.md

@@ -42,8 +42,5 @@ location ^~ /foobar/ {
     chunked_transfer_encoding off;
     proxy_buffering off;
     proxy_cache off;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
 }
 ```

docs/guide/shell.md

@@ -1,30 +0,0 @@
----
-title: Container Shell Access
----
-
-# Attaching and Executing Commands <Badge type="info" text="new" />
-
-Dozzle supports attaching or executing commands within containers. It provides a web-based interface to interact with Docker containers, allowing users to attach to running containers and execute commands directly from the browser. This feature is particularly useful for debugging and troubleshooting containerized applications. This feature is **disabled** by default as it may pose security risks. To enable it, set the `DOZZLE_ENABLE_SHELL` environment variable to `true`.
-
-::: code-group
-
-```sh
-docker run --volume=/var/run/docker.sock:/var/run/docker.sock -p 8080:8080 amir20/dozzle --enable-shell
-```
-
-```yaml [docker-compose.yml]
-services:
-  dozzle:
-    image: amir20/dozzle:latest
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    ports:
-      - 8080:8080
-    environment:
-      DOZZLE_ENABLE_SHELL: true
-```
-
-:::
-
-> [!NOTE]
-> Shell access should work across all container types, including Docker, Kubernetes, and other orchestration platforms.

docs/guide/supported-env-vars.md

@@ -17,7 +17,6 @@ Configurations can be done with flags or environment variables. The table below
 | `--auth-header-email` | `DOZZLE_AUTH_HEADER_EMAIL` | `Remote-Email` |
 | `--auth-header-name`  | `DOZZLE_AUTH_HEADER_NAME`  | `Remote-Name`  |
 | `--enable-actions`    | `DOZZLE_ENABLE_ACTIONS`    | `false`        |
-| `--enable-shell`      | `DOZZLE_ENABLE_SHELL`      | `false`        |
 | `--filter`            | `DOZZLE_FILTER`            | `""`           |
 | `--no-analytics`      | `DOZZLE_NO_ANALYTICS`      | `false`        |
 | `--mode`              | `DOZZLE_MODE`              | `server`       |

docs/index.md

@@ -25,11 +25,11 @@ features:
   - title: Real-time Logging & Monitoring
     details: Captures real-time Docker container logs, enabling quick and efficient issue diagnosis.
     icon: 🚀
-  - title: Shell Support
-    details: Supports shell access to containers, allowing you to attach or execute commands directly from the browser.
-    link: /guide/shell
+  - title: Docker Swarm Support
+    details: Supports Docker services, allowing you to monitor logs from multiple nodes in a single interface.
+    link: /guide/swarm-mode
     linkText: Learn More
-    icon: 💻
+    icon: 🐳
   - title: Multi-host Support
     details: UI support connecting to multiple remote hosts with a simple drop down to choose between different hosts.
     link: /guide/remote-hosts
@@ -45,11 +45,9 @@ features:
     icon: 🔒
     link: /guide/agent
     linkText: Learn More
-  - title: Swarm Support
-    link: /guide/swarm-mode
-    details: Supports Docker Swarm mode, allowing you to manage and monitor your swarm clusters across multiple hosts.
-    icon: 🐳
-    linkText: Learn More
+  - title: Easy to Use
+    details: Simple to set up and use, with a clean and intuitive interface that requires no additional configuration.
+    icon: 🎨
   - title: Sponsored by Docker OSS
     details: Dozzle is open source and free to use, with the source code available on GitHub.
     icon: 📜

go.mod

@@ -4,43 +4,42 @@ require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/alexflint/go-arg v1.5.1
 	github.com/beme/abide v0.0.0-20190723115211-635a09831760
-	github.com/docker/docker v28.0.4+incompatible
+	github.com/docker/docker v28.0.1+incompatible
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/magiconair/properties v1.8.9
 	github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
-	github.com/spf13/afero v1.14.0
+	github.com/spf13/afero v1.12.0
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/net v0.35.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/PuerkitoBio/goquery v1.10.2
 	github.com/go-chi/chi/v5 v5.2.1
-	github.com/go-chi/jwtauth/v5 v5.3.3
-	github.com/go-faker/faker/v4 v4.6.0
-	github.com/gorilla/websocket v1.5.3
-	github.com/puzpuzpuz/xsync/v4 v4.0.0
-	github.com/rs/zerolog v1.34.0
+	github.com/go-chi/jwtauth/v5 v5.3.2
+	github.com/puzpuzpuz/xsync/v3 v3.5.1
+	github.com/rs/zerolog v1.33.0
 	github.com/samber/lo v1.49.1
 	github.com/wk8/go-ordered-map/v2 v2.1.8
 	github.com/yuin/goldmark v1.7.8
-	golang.org/x/crypto v0.37.0
-	golang.org/x/sync v0.13.0
-	google.golang.org/grpc v1.71.1
-	google.golang.org/protobuf v1.36.6
-	k8s.io/api v0.32.3
-	k8s.io/apimachinery v0.32.3
-	k8s.io/client-go v0.32.3
-	k8s.io/metrics v0.32.3
+	golang.org/x/crypto v0.35.0
+	golang.org/x/sync v0.12.0
+	google.golang.org/grpc v1.71.0
+	google.golang.org/protobuf v1.36.5
+	k8s.io/api v0.32.2
+	k8s.io/apimachinery v0.32.2
+	k8s.io/client-go v0.32.2
+	k8s.io/metrics v0.32.2
 )
 
 require (
@@ -79,11 +78,9 @@ require (
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/spdystream v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
@@ -96,8 +93,8 @@ require (
 	go.opentelemetry.io/otel/metric v1.34.0 // indirect
 	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 	golang.org/x/oauth2 v0.26.0 // indirect
-	golang.org/x/term v0.31.0 // indirect
-	golang.org/x/text v0.24.0 // indirect
+	golang.org/x/term v0.29.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	golang.org/x/time v0.10.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
@@ -111,4 +108,4 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-go 1.24.2
+go 1.24.1

go.sum

@@ -10,8 +10,6 @@ github.com/alexflint/go-scalar v1.2.0 h1:WR7JPKkeNpnYIOfHRa7ivM21aWAdHD0gEWHCx+W
 github.com/alexflint/go-scalar v1.2.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o=
 github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
 github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
-github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
-github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
 github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
 github.com/beme/abide v0.0.0-20190723115211-635a09831760 h1:FvTM5NSN5HYvfKpgL+8x73U5v063vHsd7AX05eV1DnM=
@@ -32,8 +30,10 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v28.0.4+incompatible h1:JNNkBctYKurkw6FrHfKqY0nKIDf5nrbxjVBtS+cdcok=
-github.com/docker/docker v28.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.0.0+incompatible h1:Olh0KS820sJ7nPsBKChVhk5pzqcwDR15fumfAd/p9hM=
+github.com/docker/docker v28.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
+github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -48,10 +48,8 @@ github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv
 github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
 github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
 github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
-github.com/go-chi/jwtauth/v5 v5.3.3 h1:50Uzmacu35/ZP9ER2Ht6SazwPsnLQ9LRJy6zTZJpHEo=
-github.com/go-chi/jwtauth/v5 v5.3.3/go.mod h1:O4QvPRuZLZghl9WvfVaON+ARfGzpD2PBX/QY5vUz7aQ=
-github.com/go-faker/faker/v4 v4.6.0 h1:6aOPzNptRiDwD14HuAnEtlTa+D1IfFuEHO8+vEFwjTs=
-github.com/go-faker/faker/v4 v4.6.0/go.mod h1:ZmrHuVtTTm2Em9e0Du6CJ9CADaLEzGXW62z1YqFH0m0=
+github.com/go-chi/jwtauth/v5 v5.3.2 h1:s+ON3ATyyMs3Me0kqyuua6Rwu+2zqIIkL0GCaMarwvs=
+github.com/go-chi/jwtauth/v5 v5.3.2/go.mod h1:O4QvPRuZLZghl9WvfVaON+ARfGzpD2PBX/QY5vUz7aQ=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -86,8 +84,6 @@ github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgY
 github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -115,6 +111,8 @@ github.com/lestrrat-go/jwx/v2 v2.1.3 h1:Ud4lb2QuxRClYAmRleF50KrbKIoM1TddXgBrneT5
 github.com/lestrrat-go/jwx/v2 v2.1.3/go.mod h1:q6uFgbgZfEmQrfJfrCo90QcQOcXFMfbI/fO0NqRtvZo=
 github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
 github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
+github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
+github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
 github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
@@ -126,8 +124,6 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
-github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU=
-github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
 github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 h1:rzf0wL0CHVc8CEsgyygG0Mn9CNCCPZqOPaz8RiiHYQk=
 github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -139,8 +135,6 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
 github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
 github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
@@ -155,13 +149,13 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/puzpuzpuz/xsync/v4 v4.0.0 h1:F1za+MBXzDQtQq+OVgFsojSX4w66rsNDmQNebPFAncA=
-github.com/puzpuzpuz/xsync/v4 v4.0.0/go.mod h1:VJDmTCJMBt8igNxnkQd86r+8KUeN1quSfNKu5bLYFQo=
+github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg=
+github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
-github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
-github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
+github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
 github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
 github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
@@ -170,8 +164,8 @@ github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=
-github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo=
+github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
+github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -206,10 +200,10 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCy
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY=
 go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
 go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
-go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
-go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
-go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
-go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
+go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
+go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
+go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
+go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
 go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
 go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
 go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
@@ -222,8 +216,12 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
-golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
+golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.34.0 h1:+/C6tk6rf/+t5DhUketUbD1aNGqiSX3j15Z6xuIDlBA=
+golang.org/x/crypto v0.34.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -257,8 +255,10 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
-golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -275,8 +275,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -286,8 +286,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
-golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -297,8 +297,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
-golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
 golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -316,14 +316,17 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
-google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
+google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk=
+google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
+google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 h1:DMTIbak9GhdaSxEjvVzAeNZvyc03I61duqNbnm3SU0M=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
-google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
-google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
+google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
+google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
+google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -340,18 +343,18 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
-k8s.io/api v0.32.3 h1:Hw7KqxRusq+6QSplE3NYG4MBxZw1BZnq4aP4cJVINls=
-k8s.io/api v0.32.3/go.mod h1:2wEDTXADtm/HA7CCMD8D8bK4yuBUptzaRhYcYEEYA3k=
-k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U=
-k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
-k8s.io/client-go v0.32.3 h1:RKPVltzopkSgHS7aS98QdscAgtgah/+zmpAogooIqVU=
-k8s.io/client-go v0.32.3/go.mod h1:3v0+3k4IcT9bXTc4V2rt+d2ZPPG700Xy6Oi0Gdl2PaY=
+k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw=
+k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y=
+k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ=
+k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
+k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA=
+k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg=
 k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas=
-k8s.io/metrics v0.32.3 h1:2vsBvw0v8rIIlczZ/lZ8Kcqk9tR6Fks9h+dtFNbc2a4=
-k8s.io/metrics v0.32.3/go.mod h1:9R1Wk5cb+qJpCQon9h52mgkVCcFeYxcY+YkumfwHVCU=
+k8s.io/metrics v0.32.2 h1:7t/rZzTHFrGa9f94XcgLlm3ToAuJtdlHANcJEHlYl9g=
+k8s.io/metrics v0.32.2/go.mod h1:VL3nJpzcgB6L5nSljkkzoE0nilZhVgcjCfNRgoylaIQ=
 k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
 k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

internal/agent/client.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/amir20/dozzle/internal/agent/pb"
 	"github.com/amir20/dozzle/internal/container"
+	"github.com/amir20/dozzle/internal/utils"
 	"github.com/rs/zerolog/log"
 	orderedmap "github.com/wk8/go-ordered-map/v2"
 	"google.golang.org/grpc"
@@ -252,7 +253,21 @@ func (c *Client) StreamNewContainers(ctx context.Context, containers chan<- cont
 			return rpcErrToErr(err)
 		}
 
-		containers <- container.FromProto(resp.Container)
+		containers <- container.Container{
+			ID:         resp.Container.Id,
+			Name:       resp.Container.Name,
+			Image:      resp.Container.Image,
+			Labels:     resp.Container.Labels,
+			Group:      resp.Container.Group,
+			Created:    resp.Container.Created.AsTime(),
+			State:      resp.Container.State,
+			Health:     resp.Container.Health,
+			Host:       resp.Container.Host,
+			Tty:        resp.Container.Tty,
+			StartedAt:  resp.Container.Started.AsTime(),
+			FinishedAt: resp.Container.Finished.AsTime(),
+			Command:    resp.Container.Command,
+		}
 	}
 }
 
@@ -262,7 +277,33 @@ func (c *Client) FindContainer(ctx context.Context, containerID string) (contain
 		return container.Container{}, err
 	}
 
-	return container.FromProto(response.Container), nil
+	var stats []container.ContainerStat
+
+	for _, stat := range response.Container.Stats {
+		stats = append(stats, container.ContainerStat{
+			ID:            stat.Id,
+			CPUPercent:    stat.CpuPercent,
+			MemoryPercent: stat.MemoryPercent,
+			MemoryUsage:   stat.MemoryUsage,
+		})
+	}
+
+	return container.Container{
+		ID:         response.Container.Id,
+		Name:       response.Container.Name,
+		Image:      response.Container.Image,
+		Labels:     response.Container.Labels,
+		Group:      response.Container.Group,
+		Created:    response.Container.Created.AsTime(),
+		State:      response.Container.State,
+		Health:     response.Container.Health,
+		Host:       response.Container.Host,
+		Tty:        response.Container.Tty,
+		Command:    response.Container.Command,
+		StartedAt:  response.Container.Started.AsTime(),
+		FinishedAt: response.Container.Finished.AsTime(),
+		Stats:      utils.RingBufferFrom(300, stats),
+	}, nil
 }
 
 func (c *Client) ListContainers(ctx context.Context, labels container.ContainerLabels) ([]container.Container, error) {
@@ -282,7 +323,32 @@ func (c *Client) ListContainers(ctx context.Context, labels container.ContainerL
 
 	containers := make([]container.Container, 0)
 	for _, c := range response.Containers {
-		containers = append(containers, container.FromProto(c))
+		var stats []container.ContainerStat
+		for _, stat := range c.Stats {
+			stats = append(stats, container.ContainerStat{
+				ID:            stat.Id,
+				CPUPercent:    stat.CpuPercent,
+				MemoryPercent: stat.MemoryPercent,
+				MemoryUsage:   stat.MemoryUsage,
+			})
+		}
+
+		containers = append(containers, container.Container{
+			ID:         c.Id,
+			Name:       c.Name,
+			Image:      c.Image,
+			Labels:     c.Labels,
+			Group:      c.Group,
+			Created:    c.Created.AsTime(),
+			State:      c.State,
+			Health:     c.Health,
+			Host:       c.Host,
+			Tty:        c.Tty,
+			Command:    c.Command,
+			StartedAt:  c.Started.AsTime(),
+			FinishedAt: c.Finished.AsTime(),
+			Stats:      utils.RingBufferFrom(300, stats),
+		})
 	}
 
 	return containers, nil
@@ -329,58 +395,6 @@ func (c *Client) ContainerAction(ctx context.Context, containerId string, action
 	return err
 }
 
-func (c *Client) ContainerAttach(ctx context.Context, containerId string) (io.WriteCloser, io.Reader, error) {
-	panic("not implemented")
-}
-
-func (c *Client) ContainerExec(ctx context.Context, containerId string, cmd []string) (io.WriteCloser, io.Reader, error) {
-	stream, err := c.client.ContainerExec(ctx)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if err = stream.Send(&pb.ContainerExecRequest{
-		ContainerId: containerId,
-		Command:     cmd,
-	}); err != nil {
-		return nil, nil, err
-	}
-	stdoutReader, stdoutWriter := io.Pipe()
-	stdinReader, stdinWriter := io.Pipe()
-
-	go func() {
-		defer stdoutWriter.Close()
-
-		for {
-			msg, err := stream.Recv()
-			if err != nil {
-				return
-			}
-
-			stdoutWriter.Write(msg.Stdout)
-		}
-	}()
-
-	go func() {
-		buffer := make([]byte, 1024)
-
-		for {
-			n, err := stdinReader.Read(buffer)
-			if err != nil {
-				return
-			}
-
-			if err := stream.Send(&pb.ContainerExecRequest{
-				Stdin: buffer[:n],
-			}); err != nil {
-				return
-			}
-		}
-	}()
-
-	return stdinWriter, stdoutReader, nil
-}
-
 func (c *Client) Close() error {
 	return c.conn.Close()
 }

internal/agent/client_test.go

@@ -3,7 +3,6 @@ package agent
 import (
 	"context"
 	"crypto/tls"
-	"fmt"
 	"io"
 	"net"
 	"os"
@@ -14,8 +13,6 @@ import (
 	"github.com/amir20/dozzle/internal/container"
 	"github.com/amir20/dozzle/internal/utils"
 	"github.com/docker/docker/api/types/system"
-	"github.com/go-faker/faker/v4"
-	"github.com/go-faker/faker/v4/pkg/options"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
@@ -81,16 +78,7 @@ func (m *MockedClient) SystemInfo() system.Info {
 	return system.Info{ID: "123"}
 }
 
-var wantedContainer = container.Container{}
-
 func init() {
-	faker.FakeData(&wantedContainer, options.WithFieldsToIgnore("Stats"))
-	wantedContainer.FinishedAt = wantedContainer.FinishedAt.UTC()
-	wantedContainer.Created = wantedContainer.Created.UTC()
-	wantedContainer.StartedAt = wantedContainer.StartedAt.UTC()
-	wantedContainer.Stats = utils.NewRingBuffer[container.ContainerStat](300)
-
-	fmt.Printf("Fake data generated %+v", wantedContainer)
 	lis = bufconn.Listen(bufSize)
 
 	cwd, err := os.Getwd()
@@ -123,8 +111,27 @@ func init() {
 		time.Sleep(5 * time.Second)
 	})
 
-	client.On("FindContainer", mock.Anything, "123456").Return(wantedContainer, nil)
+	client.On("FindContainer", mock.Anything, "123456").Return(container.Container{
+		ID:      "123456",
+		Name:    "test",
+		Host:    "localhost",
+		Image:   "test",
+		State:   "running",
+		Health:  "healthy",
+		Group:   "test",
+		Command: "test",
+		Tty:     true,
+		Labels: map[string]string{
+			"test": "test",
+		},
+		Stats:      utils.NewRingBuffer[container.ContainerStat](300),
+		Created:    time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
+		StartedAt:  time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
+		FinishedAt: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
+	}, nil)
+
 	server, _ := NewServer(client, certs, "test", container.ContainerLabels{})
+
 	go server.Serve(lis)
 }
 
@@ -140,7 +147,24 @@ func TestFindContainer(t *testing.T) {
 
 	c, _ := rpc.FindContainer(context.Background(), "123456")
 
-	assert.Equal(t, wantedContainer, c)
+	assert.Equal(t, c, container.Container{
+		ID:      "123456",
+		Name:    "test",
+		Host:    "localhost",
+		Image:   "test",
+		State:   "running",
+		Health:  "healthy",
+		Group:   "test",
+		Command: "test",
+		Tty:     true,
+		Labels: map[string]string{
+			"test": "test",
+		},
+		Stats:      utils.NewRingBuffer[container.ContainerStat](300),
+		Created:    time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
+		StartedAt:  time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
+		FinishedAt: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
+	})
 }
 
 func TestListContainers(t *testing.T) {
@@ -151,7 +175,24 @@ func TestListContainers(t *testing.T) {
 
 	containers, _ := rpc.ListContainers(context.Background(), container.ContainerLabels{})
 
-	assert.Equal(t, []container.Container{
-		wantedContainer,
-	}, containers)
+	assert.Equal(t, containers, []container.Container{
+		{
+			ID:      "123456",
+			Name:    "test",
+			Host:    "localhost",
+			Image:   "test",
+			State:   "running",
+			Health:  "healthy",
+			Group:   "test",
+			Command: "test",
+			Tty:     true,
+			Labels: map[string]string{
+				"test": "test",
+			},
+			Stats:      utils.NewRingBuffer[container.ContainerStat](300),
+			Created:    time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
+			StartedAt:  time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
+			FinishedAt: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
+		},
+	})
 }

internal/agent/pb/rpc.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.5
+// 	protoc-gen-go v1.36.2
 // 	protoc        v5.29.3
 // source: rpc.proto
 
@@ -12,7 +12,6 @@ import (
 	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 	reflect "reflect"
 	sync "sync"
-	unsafe "unsafe"
 )
 
 const (
@@ -942,113 +941,9 @@ func (*ContainerActionResponse) Descriptor() ([]byte, []int) {
 	return file_rpc_proto_rawDescGZIP(), []int{19}
 }
 
-type ContainerExecRequest struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	ContainerId   string                 `protobuf:"bytes,1,opt,name=containerId,proto3" json:"containerId,omitempty"`
-	Command       []string               `protobuf:"bytes,2,rep,name=command,proto3" json:"command,omitempty"`
-	Stdin         []byte                 `protobuf:"bytes,3,opt,name=stdin,proto3" json:"stdin,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *ContainerExecRequest) Reset() {
-	*x = ContainerExecRequest{}
-	mi := &file_rpc_proto_msgTypes[20]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *ContainerExecRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ContainerExecRequest) ProtoMessage() {}
-
-func (x *ContainerExecRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_rpc_proto_msgTypes[20]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ContainerExecRequest.ProtoReflect.Descriptor instead.
-func (*ContainerExecRequest) Descriptor() ([]byte, []int) {
-	return file_rpc_proto_rawDescGZIP(), []int{20}
-}
-
-func (x *ContainerExecRequest) GetContainerId() string {
-	if x != nil {
-		return x.ContainerId
-	}
-	return ""
-}
-
-func (x *ContainerExecRequest) GetCommand() []string {
-	if x != nil {
-		return x.Command
-	}
-	return nil
-}
-
-func (x *ContainerExecRequest) GetStdin() []byte {
-	if x != nil {
-		return x.Stdin
-	}
-	return nil
-}
-
-type ContainerExecResponse struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Stdout        []byte                 `protobuf:"bytes,1,opt,name=stdout,proto3" json:"stdout,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *ContainerExecResponse) Reset() {
-	*x = ContainerExecResponse{}
-	mi := &file_rpc_proto_msgTypes[21]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *ContainerExecResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ContainerExecResponse) ProtoMessage() {}
-
-func (x *ContainerExecResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_rpc_proto_msgTypes[21]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ContainerExecResponse.ProtoReflect.Descriptor instead.
-func (*ContainerExecResponse) Descriptor() ([]byte, []int) {
-	return file_rpc_proto_rawDescGZIP(), []int{21}
-}
-
-func (x *ContainerExecResponse) GetStdout() []byte {
-	if x != nil {
-		return x.Stdout
-	}
-	return nil
-}
-
 var File_rpc_proto protoreflect.FileDescriptor
 
-var file_rpc_proto_rawDesc = string([]byte{
+var file_rpc_proto_rawDesc = []byte{
 	0x0a, 0x09, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x62, 0x75, 0x66, 0x1a, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
@@ -1162,94 +1057,78 @@ var file_rpc_proto_rawDesc = string([]byte{
 	0x66, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f,
 	0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x19, 0x0a, 0x17, 0x43, 0x6f, 0x6e,
 	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x68, 0x0a, 0x14, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
-	0x72, 0x45, 0x78, 0x65, 0x63, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0b,
-	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18,
-	0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x64, 0x69,
-	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x73, 0x74, 0x64, 0x69, 0x6e, 0x22, 0x2f,
-	0x0a, 0x15, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x45, 0x78, 0x65, 0x63, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x64, 0x6f, 0x75,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x32,
-	0xc3, 0x07, 0x0a, 0x0c, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x12, 0x55, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
-	0x72, 0x73, 0x12, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c,
-	0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0d, 0x46, 0x69, 0x6e, 0x64, 0x43,
-	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
-	0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
-	0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4b, 0x0a, 0x0a, 0x53,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x57, 0x0a, 0x10, 0x4c, 0x6f, 0x67, 0x73,
-	0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x44, 0x61, 0x74, 0x65, 0x73, 0x12, 0x21, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x6f, 0x67, 0x73, 0x42, 0x65, 0x74, 0x77,
-	0x65, 0x65, 0x6e, 0x44, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30,
-	0x01, 0x12, 0x57, 0x0a, 0x0e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x61, 0x77, 0x42, 0x79,
-	0x74, 0x65, 0x73, 0x12, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x61, 0x77, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x61, 0x77, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x51, 0x0a, 0x0c, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x1d, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x76, 0x65, 0x6e,
-	0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x4e, 0x0a,
-	0x0b, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x1c, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74,
-	0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x6f, 0x0a,
-	0x16, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72,
-	0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x12, 0x27, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
-	0x65, 0x72, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x28, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x53, 0x74, 0x61, 0x72, 0x74,
-	0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x43,
-	0x0a, 0x08, 0x48, 0x6f, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x19, 0x2e, 0x70, 0x72, 0x6f,
+	0x6f, 0x6e, 0x73, 0x65, 0x32, 0xeb, 0x06, 0x0a, 0x0c, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x55, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
+	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
+	0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0d,
+	0x46, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x12, 0x1e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e,
+	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e,
+	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x4b, 0x0a, 0x0a, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x1b,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x57, 0x0a,
+	0x10, 0x4c, 0x6f, 0x67, 0x73, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x44, 0x61, 0x74, 0x65,
+	0x73, 0x12, 0x21, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x6f, 0x67,
+	0x73, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x44, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x57, 0x0a, 0x0e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0x52, 0x61, 0x77, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x61, 0x77, 0x42, 0x79, 0x74,
+	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x61, 0x77, 0x42, 0x79,
+	0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12,
+	0x51, 0x0a, 0x0c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12,
+	0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x30, 0x01, 0x12, 0x4e, 0x0a, 0x0b, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74,
+	0x73, 0x12, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x30, 0x01, 0x12, 0x6f, 0x0a, 0x16, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x74,
+	0x61, 0x69, 0x6e, 0x65, 0x72, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x12, 0x27, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f,
+	0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72,
+	0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x30, 0x01, 0x12, 0x43, 0x0a, 0x08, 0x48, 0x6f, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+	0x19, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x48, 0x6f, 0x73, 0x74, 0x49,
+	0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x48, 0x6f, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x48, 0x6f, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x58, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x41, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x56, 0x0a,
-	0x0d, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x45, 0x78, 0x65, 0x63, 0x12, 0x1e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69,
-	0x6e, 0x65, 0x72, 0x45, 0x78, 0x65, 0x63, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69,
-	0x6e, 0x65, 0x72, 0x45, 0x78, 0x65, 0x63, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x28, 0x01, 0x30, 0x01, 0x42, 0x13, 0x5a, 0x11, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
-})
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x58, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x74,
+	0x61, 0x69, 0x6e, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x20, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72,
+	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
+	0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x42, 0x13, 0x5a, 0x11, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61,
+	0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
 
 var (
 	file_rpc_proto_rawDescOnce sync.Once
-	file_rpc_proto_rawDescData []byte
+	file_rpc_proto_rawDescData = file_rpc_proto_rawDesc
 )
 
 func file_rpc_proto_rawDescGZIP() []byte {
 	file_rpc_proto_rawDescOnce.Do(func() {
-		file_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_rpc_proto_rawDesc), len(file_rpc_proto_rawDesc)))
+		file_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_rpc_proto_rawDescData)
 	})
 	return file_rpc_proto_rawDescData
 }
 
-var file_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
+var file_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
 var file_rpc_proto_goTypes = []any{
 	(*ListContainersRequest)(nil),          // 0: protobuf.ListContainersRequest
 	(*RepeatedString)(nil),                 // 1: protobuf.RepeatedString
@@ -1271,34 +1150,32 @@ var file_rpc_proto_goTypes = []any{
 	(*StreamContainerStartedResponse)(nil), // 17: protobuf.StreamContainerStartedResponse
 	(*ContainerActionRequest)(nil),         // 18: protobuf.ContainerActionRequest
 	(*ContainerActionResponse)(nil),        // 19: protobuf.ContainerActionResponse
-	(*ContainerExecRequest)(nil),           // 20: protobuf.ContainerExecRequest
-	(*ContainerExecResponse)(nil),          // 21: protobuf.ContainerExecResponse
-	nil,                                    // 22: protobuf.ListContainersRequest.FilterEntry
-	nil,                                    // 23: protobuf.FindContainerRequest.FilterEntry
-	(*Container)(nil),                      // 24: protobuf.Container
-	(*timestamppb.Timestamp)(nil),          // 25: google.protobuf.Timestamp
-	(*LogEvent)(nil),                       // 26: protobuf.LogEvent
-	(*ContainerEvent)(nil),                 // 27: protobuf.ContainerEvent
-	(*ContainerStat)(nil),                  // 28: protobuf.ContainerStat
-	(*Host)(nil),                           // 29: protobuf.Host
-	(ContainerAction)(0),                   // 30: protobuf.ContainerAction
+	nil,                                    // 20: protobuf.ListContainersRequest.FilterEntry
+	nil,                                    // 21: protobuf.FindContainerRequest.FilterEntry
+	(*Container)(nil),                      // 22: protobuf.Container
+	(*timestamppb.Timestamp)(nil),          // 23: google.protobuf.Timestamp
+	(*LogEvent)(nil),                       // 24: protobuf.LogEvent
+	(*ContainerEvent)(nil),                 // 25: protobuf.ContainerEvent
+	(*ContainerStat)(nil),                  // 26: protobuf.ContainerStat
+	(*Host)(nil),                           // 27: protobuf.Host
+	(ContainerAction)(0),                   // 28: protobuf.ContainerAction
 }
 var file_rpc_proto_depIdxs = []int32{
-	22, // 0: protobuf.ListContainersRequest.filter:type_name -> protobuf.ListContainersRequest.FilterEntry
-	24, // 1: protobuf.ListContainersResponse.containers:type_name -> protobuf.Container
-	23, // 2: protobuf.FindContainerRequest.filter:type_name -> protobuf.FindContainerRequest.FilterEntry
-	24, // 3: protobuf.FindContainerResponse.container:type_name -> protobuf.Container
-	25, // 4: protobuf.StreamLogsRequest.since:type_name -> google.protobuf.Timestamp
-	26, // 5: protobuf.StreamLogsResponse.event:type_name -> protobuf.LogEvent
-	25, // 6: protobuf.LogsBetweenDatesRequest.since:type_name -> google.protobuf.Timestamp
-	25, // 7: protobuf.LogsBetweenDatesRequest.until:type_name -> google.protobuf.Timestamp
-	25, // 8: protobuf.StreamRawBytesRequest.since:type_name -> google.protobuf.Timestamp
-	25, // 9: protobuf.StreamRawBytesRequest.until:type_name -> google.protobuf.Timestamp
-	27, // 10: protobuf.StreamEventsResponse.event:type_name -> protobuf.ContainerEvent
-	28, // 11: protobuf.StreamStatsResponse.stat:type_name -> protobuf.ContainerStat
-	29, // 12: protobuf.HostInfoResponse.host:type_name -> protobuf.Host
-	24, // 13: protobuf.StreamContainerStartedResponse.container:type_name -> protobuf.Container
-	30, // 14: protobuf.ContainerActionRequest.action:type_name -> protobuf.ContainerAction
+	20, // 0: protobuf.ListContainersRequest.filter:type_name -> protobuf.ListContainersRequest.FilterEntry
+	22, // 1: protobuf.ListContainersResponse.containers:type_name -> protobuf.Container
+	21, // 2: protobuf.FindContainerRequest.filter:type_name -> protobuf.FindContainerRequest.FilterEntry
+	22, // 3: protobuf.FindContainerResponse.container:type_name -> protobuf.Container
+	23, // 4: protobuf.StreamLogsRequest.since:type_name -> google.protobuf.Timestamp
+	24, // 5: protobuf.StreamLogsResponse.event:type_name -> protobuf.LogEvent
+	23, // 6: protobuf.LogsBetweenDatesRequest.since:type_name -> google.protobuf.Timestamp
+	23, // 7: protobuf.LogsBetweenDatesRequest.until:type_name -> google.protobuf.Timestamp
+	23, // 8: protobuf.StreamRawBytesRequest.since:type_name -> google.protobuf.Timestamp
+	23, // 9: protobuf.StreamRawBytesRequest.until:type_name -> google.protobuf.Timestamp
+	25, // 10: protobuf.StreamEventsResponse.event:type_name -> protobuf.ContainerEvent
+	26, // 11: protobuf.StreamStatsResponse.stat:type_name -> protobuf.ContainerStat
+	27, // 12: protobuf.HostInfoResponse.host:type_name -> protobuf.Host
+	22, // 13: protobuf.StreamContainerStartedResponse.container:type_name -> protobuf.Container
+	28, // 14: protobuf.ContainerActionRequest.action:type_name -> protobuf.ContainerAction
 	1,  // 15: protobuf.ListContainersRequest.FilterEntry.value:type_name -> protobuf.RepeatedString
 	1,  // 16: protobuf.FindContainerRequest.FilterEntry.value:type_name -> protobuf.RepeatedString
 	0,  // 17: protobuf.AgentService.ListContainers:input_type -> protobuf.ListContainersRequest
@@ -1311,20 +1188,18 @@ var file_rpc_proto_depIdxs = []int32{
 	16, // 24: protobuf.AgentService.StreamContainerStarted:input_type -> protobuf.StreamContainerStartedRequest
 	14, // 25: protobuf.AgentService.HostInfo:input_type -> protobuf.HostInfoRequest
 	18, // 26: protobuf.AgentService.ContainerAction:input_type -> protobuf.ContainerActionRequest
-	20, // 27: protobuf.AgentService.ContainerExec:input_type -> protobuf.ContainerExecRequest
-	2,  // 28: protobuf.AgentService.ListContainers:output_type -> protobuf.ListContainersResponse
-	4,  // 29: protobuf.AgentService.FindContainer:output_type -> protobuf.FindContainerResponse
-	6,  // 30: protobuf.AgentService.StreamLogs:output_type -> protobuf.StreamLogsResponse
-	6,  // 31: protobuf.AgentService.LogsBetweenDates:output_type -> protobuf.StreamLogsResponse
-	9,  // 32: protobuf.AgentService.StreamRawBytes:output_type -> protobuf.StreamRawBytesResponse
-	11, // 33: protobuf.AgentService.StreamEvents:output_type -> protobuf.StreamEventsResponse
-	13, // 34: protobuf.AgentService.StreamStats:output_type -> protobuf.StreamStatsResponse
-	17, // 35: protobuf.AgentService.StreamContainerStarted:output_type -> protobuf.StreamContainerStartedResponse
-	15, // 36: protobuf.AgentService.HostInfo:output_type -> protobuf.HostInfoResponse
-	19, // 37: protobuf.AgentService.ContainerAction:output_type -> protobuf.ContainerActionResponse
-	21, // 38: protobuf.AgentService.ContainerExec:output_type -> protobuf.ContainerExecResponse
-	28, // [28:39] is the sub-list for method output_type
-	17, // [17:28] is the sub-list for method input_type
+	2,  // 27: protobuf.AgentService.ListContainers:output_type -> protobuf.ListContainersResponse
+	4,  // 28: protobuf.AgentService.FindContainer:output_type -> protobuf.FindContainerResponse
+	6,  // 29: protobuf.AgentService.StreamLogs:output_type -> protobuf.StreamLogsResponse
+	6,  // 30: protobuf.AgentService.LogsBetweenDates:output_type -> protobuf.StreamLogsResponse
+	9,  // 31: protobuf.AgentService.StreamRawBytes:output_type -> protobuf.StreamRawBytesResponse
+	11, // 32: protobuf.AgentService.StreamEvents:output_type -> protobuf.StreamEventsResponse
+	13, // 33: protobuf.AgentService.StreamStats:output_type -> protobuf.StreamStatsResponse
+	17, // 34: protobuf.AgentService.StreamContainerStarted:output_type -> protobuf.StreamContainerStartedResponse
+	15, // 35: protobuf.AgentService.HostInfo:output_type -> protobuf.HostInfoResponse
+	19, // 36: protobuf.AgentService.ContainerAction:output_type -> protobuf.ContainerActionResponse
+	27, // [27:37] is the sub-list for method output_type
+	17, // [17:27] is the sub-list for method input_type
 	17, // [17:17] is the sub-list for extension type_name
 	17, // [17:17] is the sub-list for extension extendee
 	0,  // [0:17] is the sub-list for field type_name
@@ -1340,9 +1215,9 @@ func file_rpc_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_rpc_proto_rawDesc), len(file_rpc_proto_rawDesc)),
+			RawDescriptor: file_rpc_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   24,
+			NumMessages:   22,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -1351,6 +1226,7 @@ func file_rpc_proto_init() {
 		MessageInfos:      file_rpc_proto_msgTypes,
 	}.Build()
 	File_rpc_proto = out.File
+	file_rpc_proto_rawDesc = nil
 	file_rpc_proto_goTypes = nil
 	file_rpc_proto_depIdxs = nil
 }

internal/agent/pb/rpc_grpc.pb.go

@@ -29,7 +29,6 @@ const (
 	AgentService_StreamContainerStarted_FullMethodName = "/protobuf.AgentService/StreamContainerStarted"
 	AgentService_HostInfo_FullMethodName               = "/protobuf.AgentService/HostInfo"
 	AgentService_ContainerAction_FullMethodName        = "/protobuf.AgentService/ContainerAction"
-	AgentService_ContainerExec_FullMethodName          = "/protobuf.AgentService/ContainerExec"
 )
 
 // AgentServiceClient is the client API for AgentService service.
@@ -46,7 +45,6 @@ type AgentServiceClient interface {
 	StreamContainerStarted(ctx context.Context, in *StreamContainerStartedRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[StreamContainerStartedResponse], error)
 	HostInfo(ctx context.Context, in *HostInfoRequest, opts ...grpc.CallOption) (*HostInfoResponse, error)
 	ContainerAction(ctx context.Context, in *ContainerActionRequest, opts ...grpc.CallOption) (*ContainerActionResponse, error)
-	ContainerExec(ctx context.Context, opts ...grpc.CallOption) (grpc.BidiStreamingClient[ContainerExecRequest, ContainerExecResponse], error)
 }
 
 type agentServiceClient struct {
@@ -211,19 +209,6 @@ func (c *agentServiceClient) ContainerAction(ctx context.Context, in *ContainerA
 	return out, nil
 }
 
-func (c *agentServiceClient) ContainerExec(ctx context.Context, opts ...grpc.CallOption) (grpc.BidiStreamingClient[ContainerExecRequest, ContainerExecResponse], error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	stream, err := c.cc.NewStream(ctx, &AgentService_ServiceDesc.Streams[6], AgentService_ContainerExec_FullMethodName, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &grpc.GenericClientStream[ContainerExecRequest, ContainerExecResponse]{ClientStream: stream}
-	return x, nil
-}
-
-// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type AgentService_ContainerExecClient = grpc.BidiStreamingClient[ContainerExecRequest, ContainerExecResponse]
-
 // AgentServiceServer is the server API for AgentService service.
 // All implementations must embed UnimplementedAgentServiceServer
 // for forward compatibility.
@@ -238,7 +223,6 @@ type AgentServiceServer interface {
 	StreamContainerStarted(*StreamContainerStartedRequest, grpc.ServerStreamingServer[StreamContainerStartedResponse]) error
 	HostInfo(context.Context, *HostInfoRequest) (*HostInfoResponse, error)
 	ContainerAction(context.Context, *ContainerActionRequest) (*ContainerActionResponse, error)
-	ContainerExec(grpc.BidiStreamingServer[ContainerExecRequest, ContainerExecResponse]) error
 	mustEmbedUnimplementedAgentServiceServer()
 }
 
@@ -279,9 +263,6 @@ func (UnimplementedAgentServiceServer) HostInfo(context.Context, *HostInfoReques
 func (UnimplementedAgentServiceServer) ContainerAction(context.Context, *ContainerActionRequest) (*ContainerActionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ContainerAction not implemented")
 }
-func (UnimplementedAgentServiceServer) ContainerExec(grpc.BidiStreamingServer[ContainerExecRequest, ContainerExecResponse]) error {
-	return status.Errorf(codes.Unimplemented, "method ContainerExec not implemented")
-}
 func (UnimplementedAgentServiceServer) mustEmbedUnimplementedAgentServiceServer() {}
 func (UnimplementedAgentServiceServer) testEmbeddedByValue()                      {}
 
@@ -441,13 +422,6 @@ func _AgentService_ContainerAction_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
-func _AgentService_ContainerExec_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(AgentServiceServer).ContainerExec(&grpc.GenericServerStream[ContainerExecRequest, ContainerExecResponse]{ServerStream: stream})
-}
-
-// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type AgentService_ContainerExecServer = grpc.BidiStreamingServer[ContainerExecRequest, ContainerExecResponse]
-
 // AgentService_ServiceDesc is the grpc.ServiceDesc for AgentService service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -503,12 +477,6 @@ var AgentService_ServiceDesc = grpc.ServiceDesc{
 			Handler:       _AgentService_StreamContainerStarted_Handler,
 			ServerStreams: true,
 		},
-		{
-			StreamName:    "ContainerExec",
-			Handler:       _AgentService_ContainerExec_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
 	},
 	Metadata: "rpc.proto",
 }

internal/agent/pb/types.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.5
+// 	protoc-gen-go v1.36.2
 // 	protoc        v5.29.3
 // source: types.proto
 
@@ -13,7 +13,6 @@ import (
 	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 	reflect "reflect"
 	sync "sync"
-	unsafe "unsafe"
 )
 
 const (
@@ -90,9 +89,6 @@ type Container struct {
 	Group         string                 `protobuf:"bytes,14,opt,name=group,proto3" json:"group,omitempty"`
 	Command       string                 `protobuf:"bytes,15,opt,name=command,proto3" json:"command,omitempty"`
 	Finished      *timestamppb.Timestamp `protobuf:"bytes,16,opt,name=finished,proto3" json:"finished,omitempty"`
-	MemoryLimit   uint64                 `protobuf:"varint,17,opt,name=memoryLimit,proto3" json:"memoryLimit,omitempty"`
-	CpuLimit      float64                `protobuf:"fixed64,18,opt,name=cpuLimit,proto3" json:"cpuLimit,omitempty"`
-	FullyLoaded   bool                   `protobuf:"varint,19,opt,name=fullyLoaded,proto3" json:"fullyLoaded,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -239,27 +235,6 @@ func (x *Container) GetFinished() *timestamppb.Timestamp {
 	return nil
 }
 
-func (x *Container) GetMemoryLimit() uint64 {
-	if x != nil {
-		return x.MemoryLimit
-	}
-	return 0
-}
-
-func (x *Container) GetCpuLimit() float64 {
-	if x != nil {
-		return x.CpuLimit
-	}
-	return 0
-}
-
-func (x *Container) GetFullyLoaded() bool {
-	if x != nil {
-		return x.FullyLoaded
-	}
-	return false
-}
-
 type ContainerStat struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -710,13 +685,13 @@ func (x *Host) GetDockerVersion() string {
 
 var File_types_proto protoreflect.FileDescriptor
 
-var file_types_proto_rawDesc = string([]byte{
+var file_types_proto_rawDesc = []byte{
 	0x0a, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
 	0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0xa2, 0x05, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
+	0x6f, 0x74, 0x6f, 0x22, 0xc2, 0x04, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
 	0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
 	0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x03,
@@ -748,13 +723,7 @@ var file_types_proto_rawDesc = string([]byte{
 	0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x36, 0x0a, 0x08, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65,
 	0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74,
-	0x61, 0x6d, 0x70, 0x52, 0x08, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x12, 0x20, 0x0a,
-	0x0b, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x11, 0x20, 0x01,
-	0x28, 0x04, 0x52, 0x0b, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12,
-	0x1a, 0x0a, 0x08, 0x63, 0x70, 0x75, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28,
-	0x01, 0x52, 0x08, 0x63, 0x70, 0x75, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x66,
-	0x75, 0x6c, 0x6c, 0x79, 0x4c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0b, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x4c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x1a, 0x39, 0x0a,
+	0x61, 0x6d, 0x70, 0x52, 0x08, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x1a, 0x39, 0x0a,
 	0x0b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
 	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
 	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
@@ -829,16 +798,16 @@ var file_types_proto_rawDesc = string([]byte{
 	0x0b, 0x0a, 0x07, 0x52, 0x65, 0x73, 0x74, 0x61, 0x72, 0x74, 0x10, 0x02, 0x42, 0x13, 0x5a, 0x11,
 	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70,
 	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-})
+}
 
 var (
 	file_types_proto_rawDescOnce sync.Once
-	file_types_proto_rawDescData []byte
+	file_types_proto_rawDescData = file_types_proto_rawDesc
 )
 
 func file_types_proto_rawDescGZIP() []byte {
 	file_types_proto_rawDescOnce.Do(func() {
-		file_types_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_types_proto_rawDesc), len(file_types_proto_rawDesc)))
+		file_types_proto_rawDescData = protoimpl.X.CompressGZIP(file_types_proto_rawDescData)
 	})
 	return file_types_proto_rawDescData
 }
@@ -885,7 +854,7 @@ func file_types_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_types_proto_rawDesc), len(file_types_proto_rawDesc)),
+			RawDescriptor: file_types_proto_rawDesc,
 			NumEnums:      1,
 			NumMessages:   9,
 			NumExtensions: 0,
@@ -897,6 +866,7 @@ func file_types_proto_init() {
 		MessageInfos:      file_types_proto_msgTypes,
 	}.Build()
 	File_types_proto = out.File
+	file_types_proto_rawDesc = nil
 	file_types_proto_goTypes = nil
 	file_types_proto_depIdxs = nil
 }

internal/agent/server.go

@@ -6,7 +6,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"sync"
 
 	"encoding/json"
 
@@ -189,9 +188,23 @@ func (s *server) FindContainer(ctx context.Context, in *pb.FindContainerRequest)
 	if err != nil {
 		return nil, status.Error(codes.NotFound, err.Error())
 	}
-	c := container.ToProto()
+
 	return &pb.FindContainerResponse{
-		Container: &c,
+		Container: &pb.Container{
+			Id:       container.ID,
+			Name:     container.Name,
+			Image:    container.Image,
+			Command:  container.Command,
+			Created:  timestamppb.New(container.Created),
+			State:    container.State,
+			Health:   container.Health,
+			Host:     container.Host,
+			Tty:      container.Tty,
+			Labels:   container.Labels,
+			Group:    container.Group,
+			Started:  timestamppb.New(container.StartedAt),
+			Finished: timestamppb.New(container.FinishedAt),
+		},
 	}, nil
 }
 
@@ -209,9 +222,34 @@ func (s *server) ListContainers(ctx context.Context, in *pb.ListContainersReques
 	}
 
 	var pbContainers []*pb.Container
+
 	for _, container := range containers {
-		c := container.ToProto()
-		pbContainers = append(pbContainers, &c)
+		var pbStats []*pb.ContainerStat
+		for _, stat := range container.Stats.Data() {
+			pbStats = append(pbStats, &pb.ContainerStat{
+				Id:            stat.ID,
+				CpuPercent:    stat.CPUPercent,
+				MemoryPercent: stat.MemoryPercent,
+				MemoryUsage:   stat.MemoryUsage,
+			})
+		}
+
+		pbContainers = append(pbContainers, &pb.Container{
+			Id:       container.ID,
+			Name:     container.Name,
+			Image:    container.Image,
+			Created:  timestamppb.New(container.Created),
+			State:    container.State,
+			Health:   container.Health,
+			Host:     container.Host,
+			Tty:      container.Tty,
+			Labels:   container.Labels,
+			Group:    container.Group,
+			Started:  timestamppb.New(container.StartedAt),
+			Finished: timestamppb.New(container.FinishedAt),
+			Stats:    pbStats,
+			Command:  container.Command,
+		})
 	}
 
 	return &pb.ListContainersResponse{
@@ -241,9 +279,21 @@ func (s *server) StreamContainerStarted(in *pb.StreamContainerStartedRequest, ou
 	for {
 		select {
 		case container := <-containers:
-			c := container.ToProto()
 			out.Send(&pb.StreamContainerStartedResponse{
-				Container: &c,
+				Container: &pb.Container{
+					Id:       container.ID,
+					Name:     container.Name,
+					Image:    container.Image,
+					Created:  timestamppb.New(container.Created),
+					State:    container.State,
+					Health:   container.Health,
+					Host:     container.Host,
+					Tty:      container.Tty,
+					Labels:   container.Labels,
+					Group:    container.Group,
+					Started:  timestamppb.New(container.StartedAt),
+					Finished: timestamppb.New(container.FinishedAt),
+				},
 			})
 		case <-out.Context().Done():
 			return nil
@@ -276,59 +326,6 @@ func (s *server) ContainerAction(ctx context.Context, in *pb.ContainerActionRequ
 	return &pb.ContainerActionResponse{}, nil
 }
 
-func (s *server) ContainerExec(stream pb.AgentService_ContainerExecServer) error {
-	request, err := stream.Recv()
-	if err != nil {
-		return status.Error(codes.Internal, err.Error())
-	}
-
-	cancelCtx, cancel := context.WithCancel(stream.Context())
-	containerWriter, containerReader, err := s.client.ContainerExec(cancelCtx, request.ContainerId, request.Command)
-	if err != nil {
-		cancel()
-		return status.Error(codes.Internal, err.Error())
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	go func() {
-		defer wg.Done()
-		defer cancel()
-		defer containerWriter.Close()
-		for {
-			stdinReq, err := stream.Recv()
-			if err != nil {
-				return
-			}
-
-			if _, err := containerWriter.Write(stdinReq.Stdin); err != nil {
-				return
-			}
-		}
-	}()
-
-	go func() {
-		defer wg.Done()
-		defer cancel()
-		buffer := make([]byte, 1024)
-		for {
-			n, err := containerReader.Read(buffer)
-			if err != nil {
-				return
-			}
-
-			if err := stream.Send(&pb.ContainerExecResponse{Stdout: buffer[:n]}); err != nil {
-				return
-			}
-		}
-	}()
-
-	wg.Wait()
-
-	return nil
-}
-
 func NewServer(client container.Client, certificates tls.Certificate, dozzleVersion string, labels container.ContainerLabels) (*grpc.Server, error) {
 	caCertPool := x509.NewCertPool()
 	c, err := x509.ParseCertificate(certificates.Certificate[0])

internal/container/client.go

@@ -38,6 +38,4 @@ type Client interface {
 	Ping(context.Context) error
 	Host() Host
 	ContainerActions(ctx context.Context, action ContainerAction, containerID string) error
-	ContainerAttach(ctx context.Context, id string) (io.WriteCloser, io.Reader, error)
-	ContainerExec(ctx context.Context, id string, cmd []string) (io.WriteCloser, io.Reader, error)
 }

internal/container/container_store.go

@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/puzpuzpuz/xsync/v4"
+	"github.com/puzpuzpuz/xsync/v3"
 	"github.com/rs/zerolog/log"
 	"github.com/samber/lo"
 	"golang.org/x/sync/semaphore"
@@ -20,9 +20,9 @@ type StatsCollector interface {
 }
 
 type ContainerStore struct {
-	containers              *xsync.Map[string, *Container]
-	subscribers             *xsync.Map[context.Context, chan<- ContainerEvent]
-	newContainerSubscribers *xsync.Map[context.Context, chan<- Container]
+	containers              *xsync.MapOf[string, *Container]
+	subscribers             *xsync.MapOf[context.Context, chan<- ContainerEvent]
+	newContainerSubscribers *xsync.MapOf[context.Context, chan<- Container]
 	client                  Client
 	statsCollector          StatsCollector
 	wg                      sync.WaitGroup
@@ -38,10 +38,10 @@ func NewContainerStore(ctx context.Context, client Client, statsCollect StatsCol
 	log.Debug().Str("host", client.Host().Name).Interface("labels", labels).Msg("initializing container store")
 
 	s := &ContainerStore{
-		containers:              xsync.NewMap[string, *Container](),
+		containers:              xsync.NewMapOf[string, *Container](),
 		client:                  client,
-		subscribers:             xsync.NewMap[context.Context, chan<- ContainerEvent](),
-		newContainerSubscribers: xsync.NewMap[context.Context, chan<- Container](),
+		subscribers:             xsync.NewMapOf[context.Context, chan<- ContainerEvent](),
+		newContainerSubscribers: xsync.NewMapOf[context.Context, chan<- Container](),
 		statsCollector:          statsCollect,
 		wg:                      sync.WaitGroup{},
 		events:                  make(chan ContainerEvent),
@@ -174,18 +174,18 @@ func (s *ContainerStore) FindContainer(id string, labels ContainerLabels) (Conta
 	if container, ok := s.containers.Load(id); ok {
 		if !container.FullyLoaded {
 			log.Debug().Str("id", id).Msg("container is not fully loaded, fetching it")
-			if newContainer, ok := s.containers.Compute(id, func(c *Container, loaded bool) (*Container, xsync.ComputeOp) {
+			if newContainer, ok := s.containers.Compute(id, func(c *Container, loaded bool) (*Container, bool) {
 				if loaded {
 					ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
 					defer cancel()
 					if newContainer, err := s.client.FindContainer(ctx, id); err == nil {
-						return &newContainer, xsync.UpdateOp
+						return &newContainer, false
 					} else {
 						log.Error().Err(err).Msg("failed to fetch container")
-						return c, xsync.CancelOp
+						return c, false
 					}
 				}
-				return c, xsync.CancelOp
+				return c, false
 			}); ok {
 				go func() {
 					event := ContainerEvent{
@@ -314,7 +314,7 @@ func (s *ContainerStore) init() {
 
 			case "update":
 				started := false
-				updatedContainer, _ := s.containers.Compute(event.ActorID, func(c *Container, loaded bool) (*Container, xsync.ComputeOp) {
+				updatedContainer, _ := s.containers.Compute(event.ActorID, func(c *Container, loaded bool) (*Container, bool) {
 					if loaded {
 						newContainer := event.Container
 						if newContainer.State == "running" && c.State != "running" {
@@ -327,9 +327,9 @@ func (s *ContainerStore) init() {
 						c.FinishedAt = newContainer.FinishedAt
 						c.Created = newContainer.Created
 						c.Host = newContainer.Host
-						return c, xsync.UpdateOp
+						return c, false
 					} else {
-						return c, xsync.CancelOp
+						return c, true
 					}
 				})
 
@@ -349,14 +349,14 @@ func (s *ContainerStore) init() {
 				}
 
 			case "die":
-				s.containers.Compute(event.ActorID, func(c *Container, loaded bool) (*Container, xsync.ComputeOp) {
+				s.containers.Compute(event.ActorID, func(c *Container, loaded bool) (*Container, bool) {
 					if loaded {
 						log.Debug().Str("id", c.ID).Msg("container died")
 						c.State = "exited"
 						c.FinishedAt = time.Now()
-						return c, xsync.UpdateOp
+						return c, false
 					} else {
-						return c, xsync.CancelOp
+						return c, true
 					}
 				})
 			case "health_status: healthy", "health_status: unhealthy":
@@ -365,24 +365,24 @@ func (s *ContainerStore) init() {
 					healthy = "healthy"
 				}
 
-				s.containers.Compute(event.ActorID, func(c *Container, loaded bool) (*Container, xsync.ComputeOp) {
+				s.containers.Compute(event.ActorID, func(c *Container, loaded bool) (*Container, bool) {
 					if loaded {
 						log.Debug().Str("id", c.ID).Str("health", healthy).Msg("container health status changed")
 						c.Health = healthy
-						return c, xsync.UpdateOp
+						return c, false
 					} else {
-						return c, xsync.CancelOp
+						return c, true
 					}
 				})
 
 			case "rename":
-				s.containers.Compute(event.ActorID, func(c *Container, loaded bool) (*Container, xsync.ComputeOp) {
+				s.containers.Compute(event.ActorID, func(c *Container, loaded bool) (*Container, bool) {
 					if loaded {
 						log.Debug().Str("id", event.ActorID).Str("name", event.ActorAttributes["name"]).Msg("container renamed")
 						c.Name = event.ActorAttributes["name"]
-						return c, xsync.UpdateOp
+						return c, false
 					} else {
-						return c, xsync.CancelOp
+						return c, true
 					}
 				})
 			}

internal/container/container_store_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/amir20/dozzle/internal/utils"
-	"github.com/stretchr/testify/assert"
+	"github.com/magiconair/properties/assert"
 	"github.com/stretchr/testify/mock"
 )
 

internal/container/types.go

@@ -6,9 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/amir20/dozzle/internal/agent/pb"
 	"github.com/amir20/dozzle/internal/utils"
-	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 // Container represents an internal representation of docker containers
@@ -26,76 +24,10 @@ type Container struct {
 	Tty         bool                             `json:"-"`
 	Labels      map[string]string                `json:"labels,omitempty"`
 	Stats       *utils.RingBuffer[ContainerStat] `json:"stats,omitempty"`
-	MemoryLimit uint64                           `json:"memoryLimit"`
-	CPULimit    float64                          `json:"cpuLimit"`
 	Group       string                           `json:"group,omitempty"`
 	FullyLoaded bool                             `json:"-,omitempty"`
 }
 
-func (container Container) ToProto() pb.Container {
-	var pbStats []*pb.ContainerStat
-	for _, stat := range container.Stats.Data() {
-		pbStats = append(pbStats, &pb.ContainerStat{
-			Id:            stat.ID,
-			CpuPercent:    stat.CPUPercent,
-			MemoryPercent: stat.MemoryPercent,
-			MemoryUsage:   stat.MemoryUsage,
-		})
-	}
-
-	return pb.Container{
-		Id:          container.ID,
-		Name:        container.Name,
-		Image:       container.Image,
-		Created:     timestamppb.New(container.Created),
-		State:       container.State,
-		Health:      container.Health,
-		Host:        container.Host,
-		Tty:         container.Tty,
-		Labels:      container.Labels,
-		Group:       container.Group,
-		Started:     timestamppb.New(container.StartedAt),
-		Finished:    timestamppb.New(container.FinishedAt),
-		Stats:       pbStats,
-		Command:     container.Command,
-		MemoryLimit: container.MemoryLimit,
-		CpuLimit:    container.CPULimit,
-		FullyLoaded: container.FullyLoaded,
-	}
-}
-
-func FromProto(c *pb.Container) Container {
-	var stats []ContainerStat
-	for _, stat := range c.Stats {
-		stats = append(stats, ContainerStat{
-			ID:            stat.Id,
-			CPUPercent:    stat.CpuPercent,
-			MemoryPercent: stat.MemoryPercent,
-			MemoryUsage:   stat.MemoryUsage,
-		})
-	}
-
-	return Container{
-		ID:          c.Id,
-		Name:        c.Name,
-		Image:       c.Image,
-		Labels:      c.Labels,
-		Group:       c.Group,
-		Created:     c.Created.AsTime(),
-		State:       c.State,
-		Health:      c.Health,
-		Host:        c.Host,
-		Tty:         c.Tty,
-		Command:     c.Command,
-		StartedAt:   c.Started.AsTime(),
-		FinishedAt:  c.Finished.AsTime(),
-		Stats:       utils.RingBufferFrom(300, stats),
-		MemoryLimit: c.MemoryLimit,
-		CPULimit:    c.CpuLimit,
-		FullyLoaded: c.FullyLoaded,
-	}
-}
-
 // ContainerStat represent stats instant for a container
 type ContainerStat struct {
 	ID            string  `json:"id"`
@@ -122,7 +54,7 @@ func ParseContainerFilter(commaValues string) (ContainerLabels, error) {
 		return filter, nil
 	}
 
-	for val := range strings.SplitSeq(commaValues, ",") {
+	for _, val := range strings.Split(commaValues, ",") {
 		pos := strings.Index(val, "=")
 		if pos == -1 {
 			return nil, fmt.Errorf("invalid filter: %s", filter)

internal/container/types_test.go

@@ -1,25 +0,0 @@
-package container
-
-import (
-	"testing"
-
-	"github.com/amir20/dozzle/internal/utils"
-	"github.com/go-faker/faker/v4"
-	"github.com/go-faker/faker/v4/pkg/options"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestProto(t *testing.T) {
-	expected := Container{}
-	faker.FakeData(&expected, options.WithFieldsToIgnore("Stats"))
-	expected.FinishedAt = expected.FinishedAt.UTC()
-	expected.Created = expected.Created.UTC()
-	expected.StartedAt = expected.StartedAt.UTC()
-	expected.Stats = utils.NewRingBuffer[ContainerStat](300)
-
-	pb := expected.ToProto()
-	actual := FromProto(&pb)
-
-	assert.Equal(t, expected, actual)
-
-}

internal/docker/client.go

@@ -33,10 +33,6 @@ type DockerCLI interface {
 	ContainerStart(ctx context.Context, containerID string, options docker.StartOptions) error
 	ContainerStop(ctx context.Context, containerID string, options docker.StopOptions) error
 	ContainerRestart(ctx context.Context, containerID string, options docker.StopOptions) error
-	ContainerAttach(ctx context.Context, containerID string, options docker.AttachOptions) (types.HijackedResponse, error)
-	ContainerExecCreate(ctx context.Context, containerID string, options docker.ExecOptions) (docker.ExecCreateResponse, error)
-	ContainerExecAttach(ctx context.Context, execID string, config docker.ExecAttachOptions) (types.HijackedResponse, error)
-	ContainerExecResize(ctx context.Context, execID string, options docker.ResizeOptions) error
 	Info(ctx context.Context) (system.Info, error)
 }
 
@@ -301,54 +297,6 @@ func (d *DockerClient) Host() container.Host {
 	return d.host
 }
 
-func (d *DockerClient) ContainerAttach(ctx context.Context, id string) (io.WriteCloser, io.Reader, error) {
-	log.Debug().Str("id", id).Str("host", d.host.Name).Msg("Attaching to container")
-	options := docker.AttachOptions{
-		Stream: true,
-		Stdin:  true,
-		Stdout: true,
-		Stderr: true,
-	}
-
-	waiter, err := d.cli.ContainerAttach(ctx, id, options)
-
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return waiter.Conn, waiter.Reader, nil
-}
-
-func (d *DockerClient) ContainerExec(ctx context.Context, id string, cmd []string) (io.WriteCloser, io.Reader, error) {
-	log.Debug().Str("id", id).Str("host", d.host.Name).Msg("Executing command in container")
-	options := docker.ExecOptions{
-		AttachStdout: true,
-		AttachStderr: true,
-		AttachStdin:  true,
-		Cmd:          cmd,
-		Tty:          true,
-	}
-
-	execID, err := d.cli.ContainerExecCreate(ctx, id, options)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	waiter, err := d.cli.ContainerExecAttach(ctx, execID.ID, docker.ExecAttachOptions{})
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if err = d.cli.ContainerExecResize(ctx, execID.ID, docker.ResizeOptions{
-		Width:  100,
-		Height: 40,
-	}); err != nil {
-		return nil, nil, err
-	}
-
-	return waiter.Conn, waiter.Reader, nil
-}
-
 func newContainer(c docker.Summary, host string) container.Container {
 	name := "no name"
 	if c.Labels["dev.dozzle.name"] != "" {
@@ -399,8 +347,6 @@ func newContainerFromJSON(c docker.InspectResponse, host string) container.Conta
 		Stats:       utils.NewRingBuffer[container.ContainerStat](300), // 300 seconds of stats
 		Group:       group,
 		Tty:         c.Config.Tty,
-		MemoryLimit: uint64(c.HostConfig.Memory),
-		CPULimit:    float64(c.HostConfig.NanoCPUs) / 1e9,
 		FullyLoaded: true,
 	}
 

internal/docker/client_test.go

@@ -184,11 +184,7 @@ func Test_dockerClient_FindContainer_happy(t *testing.T) {
 	proxy := new(mockedProxy)
 
 	state := &docker.State{Status: "running", StartedAt: time.Now().Format(time.RFC3339Nano)}
-
-	json := docker.InspectResponse{
-		ContainerJSONBase: &docker.ContainerJSONBase{ID: "abcdefghijklmnopqrst", State: state, HostConfig: &docker.HostConfig{}},
-		Config:            &docker.Config{Tty: false},
-	}
+	json := docker.InspectResponse{ContainerJSONBase: &docker.ContainerJSONBase{ID: "abcdefghijklmnopqrst", State: state}, Config: &docker.Config{Tty: false}}
 	proxy.On("ContainerInspect", mock.Anything, "abcdefghijkl").Return(json, nil)
 
 	client := &DockerClient{proxy, container.Host{ID: "localhost"}, system.Info{}}
@@ -217,7 +213,7 @@ func Test_dockerClient_ContainerActions_happy(t *testing.T) {
 	client := &DockerClient{proxy, container.Host{ID: "localhost"}, system.Info{}}
 
 	state := &docker.State{Status: "running", StartedAt: time.Now().Format(time.RFC3339Nano)}
-	json := docker.InspectResponse{ContainerJSONBase: &docker.ContainerJSONBase{ID: "abcdefghijkl", State: state, HostConfig: &docker.HostConfig{}}, Config: &docker.Config{Tty: false}}
+	json := docker.InspectResponse{ContainerJSONBase: &docker.ContainerJSONBase{ID: "abcdefghijkl", State: state}, Config: &docker.Config{Tty: false}}
 
 	proxy.On("ContainerInspect", mock.Anything, "abcdefghijkl").Return(json, nil)
 	proxy.On("ContainerStart", mock.Anything, "abcdefghijkl", mock.Anything).Return(nil)

internal/docker/stats_collector.go

@@ -9,15 +9,15 @@ import (
 	"time"
 
 	"github.com/amir20/dozzle/internal/container"
-	"github.com/puzpuzpuz/xsync/v4"
+	"github.com/puzpuzpuz/xsync/v3"
 	"github.com/rs/zerolog/log"
 )
 
 type DockerStatsCollector struct {
 	stream       chan container.ContainerStat
-	subscribers  *xsync.Map[context.Context, chan<- container.ContainerStat]
+	subscribers  *xsync.MapOf[context.Context, chan<- container.ContainerStat]
 	client       container.Client
-	cancelers    *xsync.Map[string, context.CancelFunc]
+	cancelers    *xsync.MapOf[string, context.CancelFunc]
 	stopper      context.CancelFunc
 	timer        *time.Timer
 	mu           sync.Mutex
@@ -30,9 +30,9 @@ var timeToStop = 6 * time.Hour
 func NewDockerStatsCollector(client container.Client, labels container.ContainerLabels) *DockerStatsCollector {
 	return &DockerStatsCollector{
 		stream:      make(chan container.ContainerStat),
-		subscribers: xsync.NewMap[context.Context, chan<- container.ContainerStat](),
+		subscribers: xsync.NewMapOf[context.Context, chan<- container.ContainerStat](),
 		client:      client,
-		cancelers:   xsync.NewMap[string, context.CancelFunc](),
+		cancelers:   xsync.NewMapOf[string, context.CancelFunc](),
 		labels:      labels,
 	}
 }

internal/k8s/client.go

@@ -17,10 +17,8 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/tools/remotecommand"
 )
 
 type K8sClient struct {
@@ -243,96 +241,8 @@ func (k *K8sClient) Host() container.Host {
 }
 
 func (k *K8sClient) ContainerActions(ctx context.Context, action container.ContainerAction, containerID string) error {
-	panic("not implemented")
-}
-
-func (k *K8sClient) ContainerAttach(ctx context.Context, id string) (io.WriteCloser, io.Reader, error) {
-	namespace, podName, containerName := parsePodContainerID(id)
-	log.Debug().Str("container", containerName).Str("pod", podName).Msg("Executing command in pod")
-	req := k.Clientset.CoreV1().RESTClient().Post().
-		Resource("pods").
-		Name(podName).
-		Namespace(namespace).
-		SubResource("attach")
-
-	option := &corev1.PodAttachOptions{
-		Container: containerName,
-		Stdin:     true,
-		Stdout:    true,
-		Stderr:    true,
-		TTY:       true,
-	}
-
-	req.VersionedParams(
-		option,
-		scheme.ParameterCodec,
-	)
-
-	exec, err := remotecommand.NewSPDYExecutor(k.config, "POST", req.URL())
-	if err != nil {
-		return nil, nil, err
-	}
-
-	stdinReader, stdinWriter := io.Pipe()
-	stdoutReader, stdoutWriter := io.Pipe()
-
-	go func() {
-		err := exec.StreamWithContext(ctx, remotecommand.StreamOptions{
-			Stdin:  stdinReader,
-			Stdout: stdoutWriter,
-			Tty:    true,
-		})
-		if err != nil {
-			log.Error().Err(err).Msg("Error streaming command")
-		}
-	}()
-
-	return stdinWriter, stdoutReader, nil
-}
-
-func (k *K8sClient) ContainerExec(ctx context.Context, id string, cmd []string) (io.WriteCloser, io.Reader, error) {
-	namespace, podName, containerName := parsePodContainerID(id)
-	log.Debug().Str("container", containerName).Str("pod", podName).Msg("Executing command in pod")
-	req := k.Clientset.CoreV1().RESTClient().Post().
-		Resource("pods").
-		Name(podName).
-		Namespace(namespace).
-		SubResource("exec")
-
-	option := &corev1.PodExecOptions{
-		Command:   cmd,
-		Container: containerName,
-		Stdin:     true,
-		Stdout:    true,
-		Stderr:    true,
-		TTY:       true,
-	}
-
-	req.VersionedParams(
-		option,
-		scheme.ParameterCodec,
-	)
-
-	exec, err := remotecommand.NewSPDYExecutor(k.config, "POST", req.URL())
-	if err != nil {
-		return nil, nil, err
-	}
-
-	stdinReader, stdinWriter := io.Pipe()
-	stdoutReader, stdoutWriter := io.Pipe()
-
-	go func() {
-		err := exec.StreamWithContext(ctx, remotecommand.StreamOptions{
-			Stdin:  stdinReader,
-			Stdout: stdoutWriter,
-			Tty:    true,
-		})
-		if err != nil {
-			log.Error().Err(err).Msg("Error streaming command")
-		}
-	}()
-
-	return stdinWriter, stdoutReader, nil
+	// Implementation for container actions (start, stop, restart, etc.)
+	return nil
 }
 
 // Helper function to parse pod and container names from container ID

internal/k8s/stats_collector.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/amir20/dozzle/internal/container"
-	"github.com/puzpuzpuz/xsync/v4"
+	"github.com/puzpuzpuz/xsync/v3"
 	"github.com/rs/zerolog/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	metricsclient "k8s.io/metrics/pkg/client/clientset/versioned"
@@ -18,7 +18,7 @@ var timeToStop = 2 * time.Hour
 type K8sStatsCollector struct {
 	client       *K8sClient
 	metrics      *metricsclient.Clientset
-	subscribers  *xsync.Map[context.Context, chan<- container.ContainerStat]
+	subscribers  *xsync.MapOf[context.Context, chan<- container.ContainerStat]
 	stopper      context.CancelFunc
 	timer        *time.Timer
 	mu           sync.Mutex
@@ -32,7 +32,7 @@ func NewK8sStatsCollector(client *K8sClient, labels container.ContainerLabels) (
 		return nil, err
 	}
 	return &K8sStatsCollector{
-		subscribers: xsync.NewMap[context.Context, chan<- container.ContainerStat](),
+		subscribers: xsync.NewMapOf[context.Context, chan<- container.ContainerStat](),
 		client:      client,
 		labels:      labels,
 		metrics:     metricsClient,

internal/support/cli/args.go

@@ -22,7 +22,6 @@ type Args struct {
 	AuthHeaderName   string              `arg:"--auth-header-name,env:DOZZLE_AUTH_HEADER_NAME" default:"Remote-Name" help:"sets the HTTP Header to use for name in Forward Proxy configuration."`
 	AuthHeaderFilter string              `arg:"--auth-header-filter,env:DOZZLE_AUTH_HEADER_FILTER" default:"Remote-Filter" help:"sets the HTTP Header to use for filtering in Forward Proxy configuration."`
 	EnableActions    bool                `arg:"--enable-actions,env:DOZZLE_ENABLE_ACTIONS" default:"false" help:"enables essential actions on containers from the web interface."`
-	EnableShell      bool                `arg:"--enable-shell,env:DOZZLE_ENABLE_SHELL" default:"false" help:"enables shell access to containers from the web interface."`
 	FilterStrings    []string            `arg:"env:DOZZLE_FILTER,--filter,separate" help:"filters docker containers using Docker syntax."`
 	Filter           map[string][]string `arg:"-"`
 	RemoteHost       []string            `arg:"env:DOZZLE_REMOTE_HOST,--remote-host,separate" help:"list of hosts to connect remotely"`
@@ -64,14 +63,6 @@ func ParseArgs() (Args, interface{}) {
 		args.Filter[key] = append(args.Filter[key], val)
 	}
 
-	for i, value := range args.RemoteAgent {
-		args.RemoteAgent[i] = strings.TrimSpace(value)
-	}
-
-	for i, value := range args.RemoteHost {
-		args.RemoteHost[i] = strings.TrimSpace(value)
-	}
-
 	if args.TimeoutString != "" {
 		timeout, err := time.ParseDuration(args.TimeoutString)
 		if err != nil {

internal/support/cli/generate_command.go

@@ -6,36 +6,22 @@ import (
 	"os"
 
 	"github.com/amir20/dozzle/internal/auth"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 )
 
 type GenerateCmd struct {
-	Username    string `arg:"positional"`
-	Password    string `arg:"--password, -p" help:"sets the password for the user"`
-	SkipConfirm bool   `arg:"--skip-confirm" help:"skip password confirmation prompt"`
-	Name        string `arg:"--name, -n" help:"sets the display name for the user"`
-	Email       string `arg:"--email, -e" help:"sets the email for the user"`
-	Filter      string `arg:"--user-filter" help:"sets the filter for the user. This can be a comma separated list of filters."`
+	Username string `arg:"positional"`
+	Password string `arg:"--password, -p" help:"sets the password for the user"`
+	Name     string `arg:"--name, -n" help:"sets the display name for the user"`
+	Email    string `arg:"--email, -e" help:"sets the email for the user"`
+	Filter   string `arg:"--user-filter" help:"sets the filter for the user. This can be a comma separated list of filters."`
 }
 
 func (g *GenerateCmd) Run(args Args, embeddedCerts embed.FS) error {
-	writer := zerolog.NewConsoleWriter()
-	log.Logger = log.Output(writer)
 	StartEvent(args, "", nil, "generate")
 	if args.Generate.Username == "" || args.Generate.Password == "" {
 		return fmt.Errorf("username and password are required")
 	}
 
-	if !args.Generate.SkipConfirm {
-		fmt.Print("Confirm password: ")
-		var confirmPassword string
-		fmt.Scanln(&confirmPassword)
-		if confirmPassword != args.Generate.Password {
-			return fmt.Errorf("passwords do not match")
-		}
-	}
-
 	buffer := auth.GenerateUsers(auth.User{
 		Username: args.Generate.Username,
 		Password: args.Generate.Password,

internal/support/container/agent_service.go

@@ -3,13 +3,11 @@ package container_support
 import (
 	"context"
 	"io"
-	"sync"
 
 	"time"
 
 	"github.com/amir20/dozzle/internal/agent"
 	"github.com/amir20/dozzle/internal/container"
-	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/rs/zerolog/log"
 )
 
@@ -72,41 +70,3 @@ func (d *agentService) SubscribeContainersStarted(ctx context.Context, container
 func (a *agentService) ContainerAction(ctx context.Context, container container.Container, action container.ContainerAction) error {
 	return a.client.ContainerAction(ctx, container.ID, action)
 }
-
-func (a *agentService) Attach(ctx context.Context, container container.Container, stdin io.Reader, stdout io.Writer) error {
-	panic("not implemented")
-}
-
-func (a *agentService) Exec(ctx context.Context, container container.Container, cmd []string, stdin io.Reader, stdout io.Writer) error {
-	cancelCtx, cancel := context.WithCancel(ctx)
-	containerWriter, containerReader, err := a.client.ContainerExec(cancelCtx, container.ID, cmd)
-
-	if err != nil {
-		cancel()
-		return err
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	go func() {
-		defer wg.Done()
-		if _, err := io.Copy(containerWriter, stdin); err != nil {
-			log.Error().Err(err).Msg("error while reading from ws using agent")
-		}
-		cancel()
-		containerWriter.Close()
-	}()
-
-	go func() {
-		defer wg.Done()
-		if _, err := stdcopy.StdCopy(stdout, stdout, containerReader); err != nil {
-			log.Error().Err(err).Msg("error while writing to ws using agent")
-		}
-		cancel()
-	}()
-
-	wg.Wait()
-
-	return nil
-}

internal/support/container/client_service.go

@@ -16,17 +16,13 @@ type ClientService interface {
 	Host(ctx context.Context) (container.Host, error)
 	ContainerAction(ctx context.Context, container container.Container, action container.ContainerAction) error
 	LogsBetweenDates(ctx context.Context, container container.Container, from time.Time, to time.Time, stdTypes container.StdType) (<-chan *container.LogEvent, error)
-	RawLogs(context.Context, container.Container, time.Time, time.Time, container.StdType) (io.ReadCloser, error)
+	RawLogs(ctx context.Context, container container.Container, from time.Time, to time.Time, stdTypes container.StdType) (io.ReadCloser, error)
 
 	// Subscriptions
-	SubscribeStats(context.Context, chan<- container.ContainerStat)
-	SubscribeEvents(context.Context, chan<- container.ContainerEvent)
-	SubscribeContainersStarted(context.Context, chan<- container.Container)
+	SubscribeStats(ctx context.Context, stats chan<- container.ContainerStat)
+	SubscribeEvents(ctx context.Context, events chan<- container.ContainerEvent)
+	SubscribeContainersStarted(ctx context.Context, containers chan<- container.Container)
 
 	// Blocking streaming functions that should be used in a goroutine
-	StreamLogs(context.Context, container.Container, time.Time, container.StdType, chan<- *container.LogEvent) error
-
-	// Terminal
-	Attach(context.Context, container.Container, io.Reader, io.Writer) error
-	Exec(context.Context, container.Container, []string, io.Reader, io.Writer) error
+	StreamLogs(ctx context.Context, container container.Container, from time.Time, stdTypes container.StdType, events chan<- *container.LogEvent) error
 }

internal/support/container/container_service.go

@@ -35,11 +35,3 @@ func (c *ContainerService) StreamLogs(ctx context.Context, from time.Time, stdTy
 func (c *ContainerService) Action(ctx context.Context, action container.ContainerAction) error {
 	return c.clientService.ContainerAction(ctx, c.Container, action)
 }
-
-func (c *ContainerService) Attach(ctx context.Context, stdin io.Reader, stdout io.Writer) error {
-	return c.clientService.Attach(ctx, c.Container, stdin, stdout)
-}
-
-func (c *ContainerService) Exec(ctx context.Context, cmd []string, stdin io.Reader, stdout io.Writer) error {
-	return c.clientService.Exec(ctx, c.Container, cmd, stdin, stdout)
-}

internal/support/docker/docker_service.go

@@ -3,7 +3,6 @@ package docker_support
 import (
 	"context"
 	"io"
-	"sync"
 	"time"
 
 	"github.com/amir20/dozzle/internal/container"
@@ -110,75 +109,3 @@ func (d *DockerClientService) SubscribeEvents(ctx context.Context, events chan<-
 func (d *DockerClientService) SubscribeContainersStarted(ctx context.Context, containers chan<- container.Container) {
 	d.store.SubscribeNewContainers(ctx, containers)
 }
-
-func (d *DockerClientService) Attach(ctx context.Context, container container.Container, stdin io.Reader, stdout io.Writer) error {
-	cancelCtx, cancel := context.WithCancel(ctx)
-	containerWriter, containerReader, err := d.client.ContainerAttach(cancelCtx, container.ID)
-	if err != nil {
-		cancel()
-		return err
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	go func() {
-		defer wg.Done()
-		if _, err := io.Copy(containerWriter, stdin); err != nil {
-			log.Error().Err(err).Msg("error while reading from ws")
-		}
-		cancel()
-		containerWriter.Close()
-	}()
-
-	go func() {
-		defer wg.Done()
-		if container.Tty {
-			if _, err := io.Copy(stdout, containerReader); err != nil {
-				log.Error().Err(err).Msg("error while writing to ws")
-			}
-		} else {
-			if _, err := stdcopy.StdCopy(stdout, stdout, containerReader); err != nil {
-				log.Error().Err(err).Msg("error while writing to ws")
-			}
-		}
-		cancel()
-	}()
-
-	wg.Wait()
-
-	return nil
-}
-
-func (d *DockerClientService) Exec(ctx context.Context, container container.Container, cmd []string, stdin io.Reader, stdout io.Writer) error {
-	cancelCtx, cancel := context.WithCancel(ctx)
-	containerWriter, containerReader, err := d.client.ContainerExec(cancelCtx, container.ID, cmd)
-	if err != nil {
-		cancel()
-		return err
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	go func() {
-		defer wg.Done()
-		if _, err := io.Copy(containerWriter, stdin); err != nil {
-			log.Error().Err(err).Msg("error while reading from ws")
-		}
-		cancel()
-		containerWriter.Close()
-	}()
-
-	go func() {
-		defer wg.Done()
-		if _, err := stdcopy.StdCopy(stdout, stdout, containerReader); err != nil {
-			log.Error().Err(err).Msg("error while writing to ws")
-		}
-		cancel()
-	}()
-
-	wg.Wait()
-
-	return nil
-}

internal/support/docker/retriable_client_manager.go

@@ -11,7 +11,7 @@ import (
 	"github.com/amir20/dozzle/internal/container"
 	container_support "github.com/amir20/dozzle/internal/support/container"
 
-	"github.com/puzpuzpuz/xsync/v4"
+	"github.com/puzpuzpuz/xsync/v3"
 	"github.com/samber/lo"
 	lop "github.com/samber/lo/parallel"
 
@@ -23,7 +23,7 @@ type RetriableClientManager struct {
 	failedAgents []string
 	certs        tls.Certificate
 	mu           sync.RWMutex
-	subscribers  *xsync.Map[context.Context, chan<- container.Host]
+	subscribers  *xsync.MapOf[context.Context, chan<- container.Host]
 	timeout      time.Duration
 }
 
@@ -39,7 +39,7 @@ func NewRetriableClientManager(agents []string, timeout time.Duration, certs tls
 		}
 
 		if _, ok := clientMap[host.ID]; ok {
-			log.Warn().Str("name", host.Name).Str("id", host.ID).Msg("An agent with an existing ID was found. Removing the duplicate host. For more details, see http://localhost:5173/guide/agent#agent-not-showing-up.")
+			log.Warn().Str("host", host.Name).Msg("duplicate client found")
 		} else {
 			clientMap[host.ID] = client
 		}
@@ -64,7 +64,7 @@ func NewRetriableClientManager(agents []string, timeout time.Duration, certs tls
 		}
 
 		if _, ok := clientMap[host.ID]; ok {
-			log.Warn().Str("name", host.Name).Str("id", host.ID).Msg("An agent with an existing ID was found. Removing the duplicate host. For more details, see http://localhost:5173/guide/agent#agent-not-showing-up.")
+			log.Warn().Str("host", host.Name).Str("id", host.ID).Msg("duplicate host with same ID found")
 		} else {
 			clientMap[host.ID] = container_support.NewAgentService(agent)
 		}
@@ -74,7 +74,7 @@ func NewRetriableClientManager(agents []string, timeout time.Duration, certs tls
 		clients:      clientMap,
 		failedAgents: failed,
 		certs:        certs,
-		subscribers:  xsync.NewMap[context.Context, chan<- container.Host](),
+		subscribers:  xsync.NewMapOf[context.Context, chan<- container.Host](),
 		timeout:      timeout,
 	}
 }

internal/support/docker/swarm_client_manager.go

@@ -14,7 +14,7 @@ import (
 	"github.com/amir20/dozzle/internal/docker"
 	container_support "github.com/amir20/dozzle/internal/support/container"
 
-	"github.com/puzpuzpuz/xsync/v4"
+	"github.com/puzpuzpuz/xsync/v3"
 	"github.com/samber/lo"
 	lop "github.com/samber/lo/parallel"
 
@@ -25,7 +25,7 @@ type SwarmClientManager struct {
 	clients      map[string]container_support.ClientService
 	certs        tls.Certificate
 	mu           sync.RWMutex
-	subscribers  *xsync.Map[context.Context, chan<- container.Host]
+	subscribers  *xsync.MapOf[context.Context, chan<- container.Host]
 	localClient  container.Client
 	localIPs     []string
 	name         string
@@ -75,7 +75,7 @@ func NewSwarmClientManager(localClient *docker.DockerClient, certs tls.Certifica
 		localClient:  localClient,
 		clients:      clientMap,
 		certs:        certs,
-		subscribers:  xsync.NewMap[context.Context, chan<- container.Host](),
+		subscribers:  xsync.NewMapOf[context.Context, chan<- container.Host](),
 		localIPs:     localIPs(),
 		name:         serviceName,
 		timeout:      timeout,

internal/support/k8s/k8s_service.go

@@ -3,7 +3,6 @@ package k8s_support
 import (
 	"context"
 	"io"
-	"sync"
 
 	"github.com/rs/zerolog/log"
 
@@ -91,67 +90,3 @@ func (k *K8sClientService) SubscribeEvents(ctx context.Context, events chan<- co
 func (k *K8sClientService) SubscribeContainersStarted(ctx context.Context, containers chan<- container.Container) {
 	k.store.SubscribeNewContainers(ctx, containers)
 }
-
-func (k *K8sClientService) Attach(ctx context.Context, container container.Container, stdin io.Reader, stdout io.Writer) error {
-	cancelCtx, cancel := context.WithCancel(ctx)
-	writer, reader, err := k.client.ContainerAttach(cancelCtx, container.ID)
-	if err != nil {
-		cancel()
-		return err
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	go func() {
-		defer writer.Close()
-		defer cancel()
-		defer wg.Done()
-		if _, err := io.Copy(writer, stdin); err != nil {
-			log.Error().Err(err).Msg("error copying stdin")
-		}
-	}()
-
-	go func() {
-		defer cancel()
-		defer wg.Done()
-		if _, err := io.Copy(stdout, reader); err != nil {
-			log.Error().Err(err).Msg("error copying stdout")
-		}
-	}()
-
-	wg.Wait()
-	return nil
-}
-
-func (k *K8sClientService) Exec(ctx context.Context, container container.Container, cmd []string, stdin io.Reader, stdout io.Writer) error {
-	cancelCtx, cancel := context.WithCancel(ctx)
-	writer, reader, err := k.client.ContainerExec(cancelCtx, container.ID, cmd)
-	if err != nil {
-		cancel()
-		return err
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	go func() {
-		defer writer.Close()
-		defer cancel()
-		defer wg.Done()
-		if _, err := io.Copy(writer, stdin); err != nil {
-			log.Error().Err(err).Msg("error copying stdin")
-		}
-	}()
-
-	go func() {
-		defer cancel()
-		defer wg.Done()
-		if _, err := io.Copy(stdout, reader); err != nil {
-			log.Error().Err(err).Msg("error copying stdout")
-		}
-	}()
-
-	wg.Wait()
-	return nil
-}

internal/web/__snapshots__/web.snapshot

@@ -84,10 +84,6 @@ Content-Type: text/html
 {"m":"INFO Testing stdout logs...","ts":1589396137772,"id":466600245,"l":"info","s":"stdout","c":"123456"}
 {"m":"INFO Testing stderr logs...","ts":1589396197772,"id":1101501603,"l":"info","s":"stderr","c":"123456"}
 
-/* snapshot: Test_handler_between_dates_with_everything_complex */
-{"m":{"msg":"a complex log message"},"ts":1589396197772,"id":62280847,"l":"unknown","s":"stdout","c":"123456"}
-
-
 /* snapshot: Test_handler_between_dates_with_fill */
 {"m":"INFO Testing stdout logs...","ts":1589396137772,"id":466600245,"l":"info","s":"stdout","c":"123456"}
 {"m":"INFO Testing stderr logs...","ts":1589396197772,"id":1101501603,"l":"info","s":"stderr","c":"123456"}

internal/web/auth_simple_test.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/amir20/dozzle/internal/auth"
 	"github.com/beme/abide"
-	"github.com/stretchr/testify/assert"
+	"github.com/magiconair/properties/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/spf13/afero"
@@ -86,7 +86,7 @@ func Test_createRoutes_simple_valid_token(t *testing.T) {
 
 	assert.Equal(t, rr.Code, 200)
 	cookie := rr.Header().Get("Set-Cookie")
-	assert.Regexp(t, `jwt=.+`, cookie)
+	assert.Matches(t, cookie, "jwt=.+")
 }
 
 func Test_createRoutes_simple_bad_password(t *testing.T) {

internal/web/auth_test.go

@@ -6,8 +6,9 @@ import (
 
 	"testing"
 
+	"github.com/magiconair/properties/assert"
+
 	"github.com/beme/abide"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/spf13/afero"

internal/web/index.go

@@ -60,7 +60,6 @@ func (h *handler) executeTemplate(w http.ResponseWriter, req *http.Request) {
 		config["hostname"] = h.config.Hostname
 		config["hosts"] = hosts
 		config["enableActions"] = h.config.EnableActions
-		config["enableShell"] = h.config.EnableShell
 	}
 
 	if user != nil {

internal/web/logs.go

@@ -129,30 +129,34 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request)
 
 		for event := range events {
 			if everything {
-				if _, ok := event.Message.(string); onlyComplex && ok {
-					continue
-				}
 				if err := encoder.Encode(event); err != nil {
 					log.Error().Err(err).Msg("error encoding log event")
 				}
-			} else {
-				if regex != nil {
-					if !search.Search(regex, event) {
-						continue
-					}
-				}
+				continue
+			}
 
-				if _, ok := levels[event.Level]; !ok {
+			if onlyComplex {
+				if _, ok := event.Message.(string); ok {
 					continue
 				}
-
-				if lastSeenId != 0 && event.Id == lastSeenId {
-					log.Debug().Uint32("lastSeenId", lastSeenId).Msg("found last seen id")
-					break
-				}
-
-				buffer.Push(event)
 			}
+
+			if regex != nil {
+				if !search.Search(regex, event) {
+					continue
+				}
+			}
+
+			if _, ok := levels[event.Level]; !ok {
+				continue
+			}
+
+			if lastSeenId != 0 && event.Id == lastSeenId {
+				log.Debug().Uint32("lastSeenId", lastSeenId).Msg("found last seen id")
+				break
+			}
+
+			buffer.Push(event)
 		}
 
 		if everything || from.Before(containerService.Container.Created) {

internal/web/logs_test.go

@@ -300,46 +300,6 @@ func Test_handler_between_dates_with_fill(t *testing.T) {
 	mockedClient.AssertExpectations(t)
 }
 
-func Test_handler_between_dates_with_everything_complex(t *testing.T) {
-	id := "123456"
-	req, err := http.NewRequest("GET", "/api/hosts/localhost/containers/"+id+"/logs", nil)
-	require.NoError(t, err, "NewRequest should not return an error.")
-
-	q := req.URL.Query()
-	q.Add("jsonOnly", "true")
-	q.Add("stdout", "true")
-	q.Add("stderr", "true")
-	q.Add("everything", "true")
-	q.Add("levels", "info")
-
-	req.URL.RawQuery = q.Encode()
-
-	mockedClient := new(MockedClient)
-
-	first := makeMessage("2020-05-13T18:55:37.772853839Z INFO Testing stdout logs...\n", container.STDOUT)
-	second := makeMessage("2020-05-13T18:56:37.772853839Z {\"msg\":\"a complex log message\"}\n", container.STDOUT)
-	data := append(first, second...)
-
-	mockedClient.On("ContainerLogsBetweenDates", mock.Anything, id, mock.Anything, mock.Anything, container.STDALL).
-		Return(io.NopCloser(bytes.NewReader(data)), nil).
-		Once()
-	mockedClient.On("FindContainer", mock.Anything, id).Return(container.Container{ID: id}, nil)
-	mockedClient.On("Host").Return(container.Host{
-		ID: "localhost",
-	})
-	mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]container.Container{
-		{ID: id, Name: "test", Host: "localhost", State: "running"},
-	}, nil)
-	mockedClient.On("ContainerEvents", mock.Anything, mock.AnythingOfType("chan<- container.ContainerEvent")).Return(nil)
-
-	handler := createDefaultHandler(mockedClient)
-	rr := httptest.NewRecorder()
-	handler.ServeHTTP(rr, req)
-	reader := strings.NewReader(regexp.MustCompile(`"time":"[^"]*"`).ReplaceAllString(rr.Body.String(), `"time":"<removed>"`))
-	abide.AssertReader(t, t.Name(), reader)
-	mockedClient.AssertExpectations(t)
-}
-
 func makeMessage(message string, stream container.StdType) []byte {
 	data := make([]byte, 8)
 	binary.BigEndian.PutUint32(data[4:], uint32(len(message)))

internal/web/routes.go

@@ -35,7 +35,6 @@ type Config struct {
 	Dev           bool
 	Authorization Authorization
 	EnableActions bool
-	EnableShell   bool
 	Labels        container.ContainerLabels
 }
 
@@ -117,10 +116,6 @@ func createRouter(h *handler) *chi.Mux {
 				if h.config.EnableActions {
 					r.Post("/hosts/{host}/containers/{id}/actions/{action}", h.containerActions)
 				}
-				if h.config.EnableShell {
-					r.Get("/hosts/{host}/containers/{id}/attach", h.attach)
-					r.Get("/hosts/{host}/containers/{id}/exec", h.exec)
-				}
 				r.Get("/releases", h.releases)
 				r.Get("/profile/avatar", h.avatar)
 				r.Patch("/profile", h.updateProfile)

internal/web/terminal.go

@@ -1,120 +0,0 @@
-package web
-
-import (
-	"net/http"
-
-	"github.com/amir20/dozzle/internal/auth"
-	"github.com/go-chi/chi/v5"
-	"github.com/gorilla/websocket"
-	"github.com/rs/zerolog/log"
-)
-
-var upgrader = websocket.Upgrader{
-	ReadBufferSize:  1024,
-	WriteBufferSize: 1024,
-	CheckOrigin: func(r *http.Request) bool {
-		return true
-	},
-}
-
-func (h *handler) attach(w http.ResponseWriter, r *http.Request) {
-	conn, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Error().Err(err).Msg("error while trying to upgrade connection")
-		return
-	}
-	defer conn.Close()
-
-	id := chi.URLParam(r, "id")
-	userLabels := h.config.Labels
-	if h.config.Authorization.Provider != NONE {
-		user := auth.UserFromContext(r.Context())
-		if user.ContainerLabels.Exists() {
-			userLabels = user.ContainerLabels
-		}
-	}
-
-	containerService, err := h.hostService.FindContainer(hostKey(r), id, userLabels)
-
-	if err != nil {
-		log.Error().Err(err).Msg("error while trying to find container")
-		return
-	}
-
-	wsReader := &webSocketReader{conn: conn}
-	wsWriter := &webSocketWriter{conn: conn}
-	if err = containerService.Attach(r.Context(), wsReader, wsWriter); err != nil {
-		log.Error().Err(err).Msg("error while trying to attach to container")
-		conn.WriteMessage(websocket.TextMessage, []byte("🚨 Error while trying to attach to container\r\n"))
-		return
-	}
-}
-
-func (h *handler) exec(w http.ResponseWriter, r *http.Request) {
-	conn, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Error().Err(err).Msg("error while trying to upgrade connection")
-		return
-	}
-	defer conn.Close()
-
-	id := chi.URLParam(r, "id")
-	userLabels := h.config.Labels
-	if h.config.Authorization.Provider != NONE {
-		user := auth.UserFromContext(r.Context())
-		if user.ContainerLabels.Exists() {
-			userLabels = user.ContainerLabels
-		}
-	}
-
-	containerService, err := h.hostService.FindContainer(hostKey(r), id, userLabels)
-	if err != nil {
-		log.Error().Err(err).Msg("error while trying to find container")
-		return
-	}
-
-	wsReader := &webSocketReader{conn: conn}
-	wsWriter := &webSocketWriter{conn: conn}
-	if err = containerService.Exec(r.Context(), []string{"sh", "-c", "command -v bash >/dev/null 2>&1 && exec bash || exec sh"}, wsReader, wsWriter); err != nil {
-		log.Error().Err(err).Msg("error while trying to attach to container")
-		conn.WriteMessage(websocket.TextMessage, []byte("🚨 Error while trying to attach to container\r\n"))
-		return
-	}
-}
-
-type webSocketWriter struct {
-	conn *websocket.Conn
-}
-
-func (w *webSocketWriter) Write(p []byte) (int, error) {
-	err := w.conn.WriteMessage(websocket.TextMessage, p)
-	return len(p), err
-}
-
-type webSocketReader struct {
-	conn   *websocket.Conn
-	buffer []byte
-}
-
-func (r *webSocketReader) Read(p []byte) (n int, err error) {
-	if len(r.buffer) > 0 {
-		n = copy(p, r.buffer)
-		r.buffer = r.buffer[n:]
-		return n, nil
-	}
-
-	// Otherwise, read a new message
-	_, message, err := r.conn.ReadMessage()
-	if err != nil {
-		return 0, err
-	}
-
-	n = copy(p, message)
-
-	// If we couldn't copy the entire message, store the rest in our buffer
-	if n < len(message) {
-		r.buffer = message[n:]
-	}
-
-	return n, nil
-}

locales/it.yml

@@ -25,8 +25,8 @@ label:
   created: Creato
   avg-cpu: CPU (%)
   avg-mem: MEM (%)
-  pinned: Fissato
-  per-page: Righe per pagina
+  pinned: Spuntato
+  per-page: Rows per page
   host-menu: Host e Container
   swarm-menu: Servizi e Stack
   group-menu: Gruppi Personalizzati
@@ -52,20 +52,20 @@ error:
 alert:
   redirected:
     title: Reindirizzamento ad un nuovo container
-    message: Dozzle si è reindirizzato automaticamente ad un nuovo container {containerId}.
+    message: Dozzle automaticamente si è reindirizzato ad un nuovo container {containerId}.
   similar-container-found:
     title: Trovato un Container simile
     message: >-
-      Dozzle ha trovato un Container simile {containerId} in esecuzione sullo stesso Host e passerà automaticamente ad esso se non premi 'Cancel'.
+      Dozzle ha trovato un Container soimile {containerId} in esecuzione sullo stesso Host and verrà automaticamente agganciato ad esso se non premi 'Cancel'.
 title:
   page-not-found: Pagina non trovata
   login: Autenticazione richiesta
   dashboard: 1 container | {count} container
-  settings: Impostazioni
+  settings: Configurazione
 button:
   logout: Logout
   login: Login
-  settings: Impostazioni
+  settings: Configurazione
   cancel: Cancel
   redirect: Redirect
 placeholder:
@@ -73,32 +73,32 @@ placeholder:
   search: Cerca
 settings:
   display: Visualizza
-  locale: Sovrascrivi Lingua
+  locale: Sovrascrivi Linguaggio
   small-scrollbars: Usa una scrollbars più piccola
   show-timesamps: Visualizza timestamp
-  soft-wrap: Soft Wrap
+  soft-wrap: Linee morbide
   datetime-format: Sovrascrivi data e formato dell'ora
   font-size: Grandezza del Font da usare nei log
-  color-scheme: Tema colori
+  color-scheme: Schema colori
   options: Opzioni
-  show-stopped-containers: Visualizza i container arrestati
+  show-stopped-containers: Visualizza i container fermi
   about: Circa
   search: Abilita la ricerca attraverso Dozzle
   using-version: Stai utilizzando Dozzle {version}.
   update-available: >-
     Nuova versione disponibile! Aggiorna a <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>.
   show-std: Visualizza stdout e stderr
-  automatic-redirect: Reindirizza automaticamente al nuovo container con lo stesso nome
-  compact: Abilita la modalità compatta per i log
+  automatic-redirect: Automaticamente reindirizza al nuovo container con lo stesso nome
+  compact: Abilita il compact mode per i log
   log:
-    preview: Questa è un'anteprima dei log
-    warning: Un log di avviso appare così
-    complex: Questa è un log complesso in formato json
-    simple: Questo è un messaggio molto molto lungo che dovrebbe andare a capo automaticamente. Disabilitando il soft wrap si può disabilitare questa funzione. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+    preview: This is a preview of the logs
+    warning: A warning log looks like this
+    complex: This is a complex log entry as json
+    simple: This is a very very long message which would wrap by default. Disabling soft wraps would disable this. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
     multi-line-error:
-      start-line: Questo è un messaggio di errore su più righe
-      middle-line: una seconda riga
-      end-line: e infine una terza riga.
+      start-line: This is a multi line error message
+      middle-line: with a second line
+      end-line: and finally third line.
 releases:
   features: nuova funzione | {count} funzioni
   bugFixes: nuovo bug fix | {count} fix

locales/zh-tw.yml

@@ -1,21 +1,24 @@
 toolbar:
   clear: 清除
   download: 下載
-  search: 搜尋
+  search: 查詢
   show: 僅顯示 {std}
-  show-all: 顯示全部
+  show-all: 顯示全部資料流
   stop: 停止
   start: 啟動
   restart: 重新啟動
-  show-hostname: 顯示主機名稱
-  show-container-name: 顯示容器名稱
 label:
   containers: 容器
   container: 無容器 | 1 個容器 | {count} 個容器
   service: 無服務 | 1 個服務 | {count} 個服務
-  services: 服務
-  running-containers: 運作中的容器
+  running-containers: 運行中的容器
   all-containers: 所有容器
+  total-containers: 總容器數
+  running: 運行中
+  total-cpu-usage: 總 CPU 使用率
+  total-mem-usage: 總記憶體使用率
+  dozzle-version: Dozzle 版本
+  all: 全部
   host: 主機
   hosts: 主機
   password: 密碼
@@ -23,44 +26,38 @@ label:
   container-name: 容器名稱
   status: 狀態
   created: 建立時間
-  avg-cpu: 平均 CPU 使用率 (%)
-  avg-mem: 平均記憶體使用率 (%)
+  avg-cpu: 平均 CPU (%)
+  avg-mem: 平均記憶體 (%)
   pinned: 已釘選
-  per-page: 每頁列數
+  per-page: 每頁顯示行數
+  swarm-mode: Swarm 模式
+  services: 服務
+  custom-groups: 自訂群組
   host-menu: 主機和容器
   swarm-menu: 服務和堆疊
-  group-menu: 自訂群組
+  group-menu: 自定義群組
 tooltip:
-  search: 搜尋容器 (⌘ + k, ⌃k)
-  pin-column: 釘選為欄位
-  merge-services: 將所有服務合併至單一檢視
-  merge-containers: 將所有容器合併至單一檢視
-  merge-hosts: 將此主機上的所有容器合併至單一檢視
+  search: 查詢容器 (⌘ + k, ⌃k)
+  pin-column: 固定此列
+  merge-services: 合併所有服務到一個視圖
+  merge-containers: 合併所有容器到一個視圖
+  merge-hosts: 將此主機上的所有容器合併到一個視圖中
 error:
-  page-not-found: 此頁面不存在
-  invalid-auth: 使用者名稱或密碼不正確
-  logs-skipped: 已略過 {total} 筆記錄
-  container-not-found: 找不到容器
   events-stream:
     title: 意外錯誤
     message: >-
-      Dozzle UI 無法連線至 API。請檢查您的網路設定。
-      如果您使用反向代理伺服器，請確認其設定正確。
+      Dozzle UI 無法連接到 API。請檢查您的網路設定。
+      如果您使用反向代理，請確保其正確配置。
   events-timeout:
     title: 發生錯誤
     message: >-
-      Dozzle UI 連線至 API 時逾時。請檢查網路連線後再試一次。
-alert:
-  redirected:
-    title: 已重新導向至新容器
-    message: Dozzle 已自動將您重新導向至新容器 {containerId}。
-  similar-container-found:
-    title: 找到相似的容器
-    message: >-
-      Dozzle 在相同主機上找到一個相似的容器 {containerId}，
-      除非您點選「取消」，否則系統將自動切換至該容器。
+      Dozzle UI 連接 API 時超時。請檢查網路連接並重試。
+  page-not-found: 此頁面不存在。
+  invalid-auth: 使用者名稱和密碼不正確。
+  logs-skipped: 略過 {total} 筆記錄
+  container-not-found: 找不到容器。
 title:
-  page-not-found: 找不到頁面
+  page-not-found: 頁面不存在
   login: 需要身份驗證
   dashboard: 1 個容器 | {count} 個容器
   settings: 設定
@@ -71,49 +68,49 @@ button:
   cancel: 取消
   redirect: 重新導向
 placeholder:
-  search-containers: 搜尋容器 (⌘ + k, ⌃k)
-  search: 搜尋
+  search-containers: 查詢容器 (⌘ + k, ⌃k)
+  search: 查詢
 settings:
   display: 顯示
-  locale: 變更語言
+  locale: 覆寫語言
   small-scrollbars: 使用較小的捲軸
   show-timesamps: 顯示時間戳記
   soft-wrap: 自動換行
-  datetime-format: 變更日期與時間格式
-  font-size: 日誌字型大小
-  color-scheme: 顏色設定
+  12-24-format: >-
+    預設情況下，Dozzle 會使用您瀏覽器的區域設定來格式化時間。您可以強制使用 12 或 24 小時制。
+  font-size: 日誌的字型大小
+  color-scheme: 顏色配置
   options: 選項
   show-stopped-containers: 顯示已停止的容器
   about: 關於
-  search: 啟用 Dozzle 搜尋功能
-  using-version: 您目前使用的是 Dozzle {version}。
+  search: 以 Dozzle 進行查詢
+  using-version: 您正在使用 Dozzle {version}。
   update-available: >-
-    有新版本可用！請更新至 <a href="{href}" target="_blank"
-    rel="noreferrer noopener">{nextVersion}</a>。
-  show-std: 顯示標準輸出(stdout)與標準錯誤(stderr)標籤
+    有新版本可用！請更新至 <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>。
+  show-std: 顯示 stdout 和 stderr 標籤
+  compact: 緊湊模式
   automatic-redirect: 自動重新導向至相同名稱的新容器
-  compact: 啟用緊湊模式
   log:
     preview: 這是日誌的預覽
     warning: 警告日誌看起來是這樣的
-    complex: 這是一筆 JSON 格式的複雜日誌項目
-    simple: 這是一段非常長的訊息，預設情況下會自動換行。停用自動換行後便不會換行。Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+    complex: 這是一個複雜的 JSON 格式日誌條目
+    simple: 這是一條非常非常長的訊息，默認情況下會自動換行。禁用自動換行會使其禁用。Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
     multi-line-error:
-      start-line: 這是一段多行錯誤訊息
-      middle-line: 這是第二行
+      start-line: 這是一條多行錯誤訊息
+      middle-line: 第二行訊息
       end-line: 最後是第三行。
 releases:
-  features: 一項新功能 | {count} 項新功能
-  bugFixes: 一項錯誤修正 | {count} 項修正
-  breaking: 一項重大變更 | {count} 項重大變更
-  three_parts: "{first}、{second} 與 {third}"
+  features: 一個新功能 | {count} 個新功能
+  bugFixes: 一個錯誤修復 | {count} 個修復
+  breaking: 一個重大變更 | {count} 個重大變更
+  three_parts: "{first}、{second} 和 {third}"
   two_parts: "{first} 與 {second}"
-  latest: 最新版本
+  latest: 最新
   no_releases: 您已經是最新版本
 log_actions:
   copy_log: 複製日誌
-  jump_to_context: 跳至相關內容
+  jump_to_context: 跳轉至上下文
 toasts:
   copied:
     title: 已複製
-    message: 日誌已複製到剪貼簿
+    message: 日誌已複製到剪貼簿

main.go

@@ -129,14 +129,6 @@ func main() {
 	log.Debug().Msg("shut down complete")
 }
 
-func fileExists(filename string) bool {
-    _, err := os.Stat(filename)
-    if os.IsNotExist(err) {
-        return false
-    }
-    return err == nil
-}
-
 func createServer(args cli.Args, hostService web.HostService) *http.Server {
 	_, dev := os.LookupEnv("DEV")
 
@@ -149,21 +141,21 @@ func createServer(args cli.Args, hostService web.HostService) *http.Server {
 	} else if args.AuthProvider == "simple" {
 		log.Debug().Msg("Using simple authentication")
 		provider = web.SIMPLE
-		
-        userFilePath := "./data/users.yml"
-        if !fileExists(userFilePath) {
-            userFilePath = "./data/users.yaml"
-            if !fileExists(userFilePath) {
-                log.Fatal().Msg("No users.yaml or users.yml file found.")
-            }
-        }
 
-        log.Debug().Msgf("Reading %s file", filepath.Base(userFilePath))
+		path, err := filepath.Abs("./data/users.yml")
+		if err != nil {
+			log.Fatal().Err(err).Msg("Could not get absolute path")
+		}
+		if _, err := os.Stat(path); os.IsNotExist(err) {
+			log.Fatal().Msg("users.yml file does not exist")
+		}
 
-        db, err := auth.ReadUsersFromFile(userFilePath)
-        if err != nil {
-            log.Fatal().Err(err).Msgf("Could not read users file: %s", userFilePath)
-        }
+		log.Debug().Str("path", path).Msg("Reading users.yml file")
+
+		db, err := auth.ReadUsersFromFile(path)
+		if err != nil {
+			log.Fatal().Err(err).Msg("Could not read users.yml file")
+		}
 
 		log.Debug().Int("users", len(db.Users)).Msg("Loaded users")
 		ttl := time.Duration(0)
@@ -199,7 +191,6 @@ func createServer(args cli.Args, hostService web.HostService) *http.Server {
 			TTL:        authTTL,
 		},
 		EnableActions: args.EnableActions,
-		EnableShell:   args.EnableShell,
 		Labels:        args.Filter,
 	}
 

package.json

@@ -1,12 +1,12 @@
 {
   "name": "dozzle",
-  "version": "8.12.7",
+  "version": "8.11.7",
   "description": "Realtime log viewer for docker containers.",
   "homepage": "https://github.com/amir20/dozzle#readme",
   "bugs": {
     "url": "https://github.com/amir20/dozzle/issues"
   },
-  "packageManager": "pnpm@10.8.0",
+  "packageManager": "pnpm@10.5.2",
   "type": "module",
   "repository": {
     "type": "git",
@@ -33,21 +33,19 @@
     "@iconify-json/carbon": "^1.2.8",
     "@iconify-json/cil": "^1.2.2",
     "@iconify-json/ic": "^1.2.2",
-    "@iconify-json/material-symbols": "^1.2.18",
+    "@iconify-json/material-symbols": "^1.2.15",
     "@iconify-json/mdi": "^1.2.3",
     "@iconify-json/mdi-light": "^1.2.2",
     "@iconify-json/octicon": "^1.2.5",
     "@iconify-json/ph": "^1.2.2",
-    "@intlify/unplugin-vue-i18n": "^6.0.5",
-    "@oddbird/css-anchor-positioning": "^0.5.1",
+    "@intlify/unplugin-vue-i18n": "^6.0.3",
+    "@oddbird/css-anchor-positioning": "^0.4.0",
     "@tailwindcss/typography": "^0.5.16",
-    "@tailwindcss/vite": "4.1.3",
-    "@vueuse/components": "^13.1.0",
-    "@vueuse/core": "^13.1.0",
-    "@vueuse/integrations": "^13.1.0",
-    "@vueuse/router": "^13.1.0",
-    "@xterm/addon-web-links": "^0.11.0",
-    "@xterm/xterm": "^5.5.0",
+    "@tailwindcss/vite": "4.0.12",
+    "@vueuse/components": "^12.8.2",
+    "@vueuse/core": "^12.8.2",
+    "@vueuse/integrations": "^12.8.2",
+    "@vueuse/router": "^12.8.2",
     "ansi-to-html": "^0.7.2",
     "d3-array": "^3.2.4",
     "d3-ease": "^3.0.1",
@@ -55,36 +53,34 @@
     "d3-selection": "^3.0.0",
     "d3-shape": "^3.2.0",
     "d3-transition": "^3.0.1",
-    "daisyui": "5.0.18",
+    "daisyui": "5.0.0",
     "date-fns": "^4.1.0",
     "entities": "^6.0.0",
     "fuse.js": "^7.1.0",
     "lodash.debounce": "^4.0.8",
-    "pinia": "^3.0.2",
+    "pinia": "^3.0.1",
     "sortablejs": "^1.15.6",
-    "splitpanes": "^4.0.3",
+    "splitpanes": "^3.1.8",
     "strip-ansi": "^7.1.0",
-    "tailwindcss": "4.1.3",
-    "unplugin-auto-import": "^19.1.2",
+    "tailwindcss": "4.0.12",
+    "unplugin-auto-import": "^19.1.1",
     "unplugin-icons": "^22.1.0",
     "unplugin-vue-components": "^28.4.1",
     "unplugin-vue-macros": "^2.14.5",
     "unplugin-vue-router": "^0.12.0",
-    "vite": "6.2.6",
+    "vite": "6.2.1",
     "vite-plugin-compression2": "^1.3.3",
     "vite-plugin-vue-layouts": "^0.11.0",
     "vite-svg-loader": "^5.1.0",
     "vitepress": "1.6.3",
     "vue": "^3.5.13",
-    "vue-i18n": "^11.1.3",
+    "vue-i18n": "^11.1.2",
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
     "@apache-arrow/esnext-esm": "^19.0.1",
-    "@iconify-json/material-symbols-light": "^1.2.18",
-    "@iconify-json/ri": "^1.2.5",
-    "@pinia/testing": "^1.0.1",
-    "@playwright/test": "^1.51.1",
+    "@pinia/testing": "^1.0.0",
+    "@playwright/test": "^1.51.0",
     "@types/d3-array": "^3.2.1",
     "@types/d3-ease": "^3.0.2",
     "@types/d3-scale": "^4.0.9",
@@ -92,24 +88,24 @@
     "@types/d3-shape": "^3.1.7",
     "@types/d3-transition": "^3.0.9",
     "@types/lodash.debounce": "^4.0.9",
-    "@types/node": "^22.14.0",
-    "@vitejs/plugin-vue": "5.2.3",
+    "@types/node": "^22.13.9",
+    "@vitejs/plugin-vue": "5.2.1",
     "@vue/compiler-sfc": "^3.5.13",
     "@vue/test-utils": "^2.4.6",
-    "bumpp": "^10.1.0",
+    "bumpp": "^10.0.3",
     "c8": "^10.1.3",
     "concurrently": "^9.1.2",
     "eventsourcemock": "^2.0.0",
     "jsdom": "^26.0.0",
-    "lint-staged": "^15.5.0",
+    "lint-staged": "^15.4.3",
     "prettier": "^3.5.3",
     "prettier-plugin-tailwindcss": "^0.6.11",
-    "simple-git-hooks": "^2.12.1",
+    "simple-git-hooks": "^2.11.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.3",
-    "vitest": "^3.1.1",
-    "vue-component-type-helpers": "3.0.0-alpha.4",
-    "vue-tsc": "3.0.0-alpha.4"
+    "typescript": "^5.8.2",
+    "vitest": "^3.0.8",
+    "vue-component-type-helpers": "^2.2.8",
+    "vue-tsc": "^2.2.8"
   },
   "lint-staged": {
     "*.{js,vue,css,ts,html,md}": [

protos/rpc.proto

@@ -21,8 +21,6 @@ service AgentService {
   rpc HostInfo(HostInfoRequest) returns (HostInfoResponse) {}
   rpc ContainerAction(ContainerActionRequest)
       returns (ContainerActionResponse) {}
-  rpc ContainerExec(stream ContainerExecRequest)
-      returns (stream ContainerExecResponse) {}
 }
 
 message ListContainersRequest { map<string, RepeatedString> filter = 1; }
@@ -80,11 +78,3 @@ message ContainerActionRequest {
 }
 
 message ContainerActionResponse {}
-
-message ContainerExecRequest {
-  string containerId = 1;
-  repeated string command = 2;
-  bytes stdin = 3;
-}
-
-message ContainerExecResponse { bytes stdout = 1; }

protos/types.proto

@@ -23,9 +23,6 @@ message Container {
   string group = 14;
   string command = 15;
   google.protobuf.Timestamp finished = 16;
-  uint64 memoryLimit = 17;
-  double cpuLimit = 18;
-  bool fullyLoaded = 19;
 }
 
 message ContainerStat {

public/index.html

@@ -2,10 +2,7 @@
 <html class="bg-base-200 text-base-content">
   <head>
     <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, viewport-fit=cover" />
-    <meta name="mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-    <meta name="theme-color" content="" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>Dozzle</title>
     <script type="application/json" id="config__json">
       {{ marshal .Config }}
@@ -19,10 +16,9 @@
     <link rel="stylesheet" href="{{ .Base }}/{{ index $css 0}}" />
     <script type="module" src="{{ .Base }}/{{ $js }}"></script>
     {{- end }}
-    <meta name="description" content="A log viewer for containers" />
+    <meta name="description" content="Dozzle is a log viewer for Docker" />
     <meta name="robots" content="noindex" />
     <link rel="apple-touch-icon" href="{{ .Base }}/apple-touch-icon.png" sizes="512x512" />
-    <link rel="manifest" href="{{ .Base }}/manifest.webmanifest" />
   </head>
 
   <body>

public/manifest.webmanifest

@@ -1,10 +0,0 @@
-{
-  "name": "Dozzle",
-  "short_name": "Dozzle",
-  "start_url": "/",
-  "display": "standalone",
-  "lang": "en",
-  "scope": "/",
-  "description": "A log viewer for containers",
-  "icons": [{ "src": "/apple-touch-icon.png", "sizes": "512x512", "type": "image/png" }]
-}

vite.config.ts

@@ -68,6 +68,7 @@ export default defineConfig(() => ({
     }),
     VueI18nPlugin({
       runtimeOnly: true,
+      compositionOnly: true,
       strictMessage: false,
       include: [path.resolve(__dirname, "locales/**")],
     }),