From 1ca2f97ed634b22ec741071bdf126615aec05faa Mon Sep 17 00:00:00 2001
From: Codex <codex@local>
Date: Wed, 22 Jul 2026 00:42:53 -0700
Subject: [PATCH] fix: restore ADC init sidecar for stock LiteLLM

---
 servers/bwh-hk-dc3/litellm/Dockerfile         |  9 -------
 servers/bwh-hk-dc3/litellm/compose.yaml       | 27 ++++++++++++++++---
 .../bwh-hk-dc3/litellm/vertex-entrypoint.sh   |  7 -----
 3 files changed, 23 insertions(+), 20 deletions(-)
 delete mode 100644 servers/bwh-hk-dc3/litellm/Dockerfile
 delete mode 100644 servers/bwh-hk-dc3/litellm/vertex-entrypoint.sh

diff --git a/servers/bwh-hk-dc3/litellm/Dockerfile b/servers/bwh-hk-dc3/litellm/Dockerfile
deleted file mode 100644
index d81d875..0000000
--- a/servers/bwh-hk-dc3/litellm/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM ghcr.io/berriai/litellm:main-stable
-
-USER root
-RUN apk add --no-cache coreutils
-
-COPY vertex-entrypoint.sh /app/vertex-entrypoint.sh
-RUN chmod 0755 /app/vertex-entrypoint.sh
-
-ENTRYPOINT ["/app/vertex-entrypoint.sh"]
diff --git a/servers/bwh-hk-dc3/litellm/compose.yaml b/servers/bwh-hk-dc3/litellm/compose.yaml
index eecf534..e028705 100644
--- a/servers/bwh-hk-dc3/litellm/compose.yaml
+++ b/servers/bwh-hk-dc3/litellm/compose.yaml
@@ -1,21 +1,40 @@
 services:
+  adc-init:
+    image: alpine:3.22
+    restart: "no"
+    environment:
+      GOOGLE_ADC_B64: ${GOOGLE_ADC_B64}
+    volumes:
+      - google-adc:/credentials
+    command:
+      - /bin/sh
+      - -c
+      - |
+        umask 077
+        printf '%s' "$${GOOGLE_ADC_B64}" | base64 -d > /credentials/application_default_credentials.json
+
   litellm:
-    build: .
-    image: local/litellm-vertex:main-stable
+    image: ghcr.io/berriai/litellm:main-stable
     restart: unless-stopped
+    depends_on:
+      adc-init:
+        condition: service_completed_successfully
     ports:
       - "${LISTEN_IP:-127.0.0.1}:${HOST_PORT:-4000}:4000"
     environment:
-      GOOGLE_ADC_B64: ${GOOGLE_ADC_B64}
-      GOOGLE_APPLICATION_CREDENTIALS: /tmp/application_default_credentials.json
+      GOOGLE_APPLICATION_CREDENTIALS: /credentials/application_default_credentials.json
       VERTEXAI_PROJECT: ${VERTEXAI_PROJECT}
       VERTEXAI_LOCATION: ${VERTEXAI_LOCATION:-global}
       LITELLM_MASTER_KEY: ${LITELLM_MASTER_KEY}
     volumes:
       - ./config.yaml:/app/config.yaml:ro
+      - google-adc:/credentials:ro
     command: ["--config", "/app/config.yaml", "--host", "0.0.0.0", "--port", "4000"]
     logging:
       driver: json-file
       options:
         max-size: 1m
         max-file: "2"
+
+volumes:
+  google-adc:
diff --git a/servers/bwh-hk-dc3/litellm/vertex-entrypoint.sh b/servers/bwh-hk-dc3/litellm/vertex-entrypoint.sh
deleted file mode 100644
index d533283..0000000
--- a/servers/bwh-hk-dc3/litellm/vertex-entrypoint.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -eu
-
-umask 077
-printf '%s' "${GOOGLE_ADC_B64}" | base64 -d > "${GOOGLE_APPLICATION_CREDENTIALS}"
-
-exec /app/docker/prod_entrypoint.sh "$@"