Refactor CMD in Dockerfile and update start-openclaw.sh for improved argument handling

.github/workflows/build-docker.yml

@@ -33,7 +33,7 @@ jobs:
     name: "clash"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh && build_image clash latest docker_clash/clash.Dockerfile && push_image clash
 
@@ -42,7 +42,7 @@ jobs:
     name: "gui-linux"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh && build_image gui-linux latest docker_gui/gui_linux.Dockerfile && push_image gui
 
@@ -52,7 +52,7 @@ jobs:
     name: "casdoor"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh && build_image casdoor latest docker_casdoor/casdoor.Dockerfile && push_image casdoor
 
@@ -61,7 +61,7 @@ jobs:
     name: "keycloak"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh && build_image keycloak latest docker_keycloak/keycloak.Dockerfile && push_image keycloak
 
@@ -70,33 +70,28 @@ jobs:
     name: "dev-hub"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh
-          build_image dev-hub latest docker_devbox/hub.Dockerfile \
-            --build-arg "BASE_IMG=node" \
-            --build-arg "ARG_PROFILE_JUPYTER=hub"
+          build_image dev-hub latest docker_devbox/hub.Dockerfile --build-arg "BASE_IMG=node" --build-arg "ARG_PROFILE_JUPYTER=hub"
           push_image dev-hub
 
   job-dev-hub-traefik:
     name: "dev-hub-traefik"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh
-          build_image dev-hub-traefik latest docker_devbox/hub.Dockerfile \
-            --build-arg "BASE_IMG=base" \
-            --build-arg "ARG_PROFILE_JUPYTER=hub" \
-            --build-arg "ARG_KEEP_NODEJS=false"
+          build_image dev-hub-traefik latest docker_devbox/hub.Dockerfile --build-arg "BASE_IMG=base" --build-arg "ARG_PROFILE_JUPYTER=hub" --build-arg "ARG_KEEP_NODEJS=false"
           push_image dev-hub-traefik
 
   ## OpenResty as gateway
   job-openresty:
     name: "openresty"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh && build_image openresty latest docker_openresty/openresty.Dockerfile && push_image openresty
 
@@ -105,7 +100,7 @@ jobs:
     name: "searxng"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh && build_image searxng latest docker_searxng/searxng.Dockerfile && push_image searxng
 
@@ -114,7 +109,7 @@ jobs:
     name: "storebox"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh
           build_image storebox latest docker_storebox/storebox.Dockerfile && push_image storebox
@@ -124,7 +119,7 @@ jobs:
     name: "logent"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh
           build_image logent latest docker_logent/logent.Dockerfile && push_image logent
@@ -134,7 +129,7 @@ jobs:
     name: "nocobase"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh
           build_image nocobase latest docker_nocobase/nocobase.Dockerfile && push_image nocobase
@@ -144,7 +139,7 @@ jobs:
     name: "openclaw"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh
           build_image openclaw latest docker_openclaw/openclaw.Dockerfile && push_image openclaw
@@ -154,7 +149,7 @@ jobs:
     name: "hermes"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh
           build_image hermes latest docker_hermes/hermes.Dockerfile && push_image hermes
@@ -164,7 +159,7 @@ jobs:
     name: "developer,base-dev"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh && free_diskspace
           build_image base-dev latest docker_devbox/dev.Dockerfile \
@@ -178,7 +173,7 @@ jobs:
     name: "data-science-dev"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh && free_diskspace
           build_image data-science-dev latest docker_devbox/dev.Dockerfile \
@@ -193,7 +188,7 @@ jobs:
     name: "full-stack-dev"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh && free_diskspace
           build_image full-stack-dev latest docker_devbox/dev.Dockerfile \
@@ -208,7 +203,7 @@ jobs:
     name: "full-cuda,cuda-dev"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: |
           source ./tool.sh && free_diskspace
           build_image cuda-dev latest docker_devbox/dev.Dockerfile \
@@ -240,7 +235,7 @@ jobs:
       ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - env:
           AUTH_FILE_CONTENT: ${{ secrets.AUTH_FILE_CONTENT }}
           DOCKER_MIRROR_REGISTRY: ${{ vars.DOCKER_MIRROR_REGISTRY }}

docker_keycloak/work/script-setup-keycloak.sh

@@ -3,7 +3,7 @@ source /opt/utils/script-utils.sh
 setup_keycloak() {
   # Install the latest (but not nightly) version of keycloak
      VER_KEYCLOAK_MAJOR="26" \
-  && VER_KEYCLOAK=$(curl -sL https://github.com/keycloak/keycloak/releases.atom | grep 'releases/tag' | grep -v nightly | grep "${VER_KEYCLOAK_MAJOR}"  | head -1 | grep -Po '\d[\d.]+' ) \
+  && VER_KEYCLOAK=$(curl -sL https://api.github.com/repos/keycloak/keycloak/releases | jq -r --arg major "${VER_KEYCLOAK_MAJOR}" 'map(select(.prerelease == false and (.tag_name | startswith($major + "."))))[0].tag_name') \
   && URL_KEYCLOAK="https://github.com/keycloak/keycloak/releases/download/$VER_KEYCLOAK/keycloak-$VER_KEYCLOAK.tar.gz" \
   && echo "Downloading Keycloak version ${VER_KEYCLOAK} from: ${URL_KEYCLOAK}" \
   && install_tar_gz $URL_KEYCLOAK \

docker_litellm/demo/docker-compose.litellm.yml

@@ -0,0 +1,19 @@
+services:
+  svc-litellm:
+    container_name: svc-litellm
+    image: quay.io/labnow/litellm:latest
+    restart: unless-stopped
+    # networks: ["net-litellm"]
+    ports:
+      - "4000:4000"
+    volumes:
+      - ./data:/root/workspace
+    # environment:
+    #   - LITELLM_MASTER_KEY=sk-1234
+    #   - OPENAI_API_KEY=your-openai-key
+    #   - GEMINI_API_KEY=your-gemini-key
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"

docker_litellm/litellm.Dockerfile

@@ -1,30 +1,27 @@
 # Distributed under the terms of the Modified BSD License.
 
 ARG BASE_NAMESPACE
-ARG BASE_IMG="node"
+ARG BASE_IMG_BUILD="node"
+ARG BASE_IMG="base"
 
 # --- Building Stage ---
-FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG} AS builder
+FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG_BUILD} AS builder
 
 LABEL maintainer="postmaster@labnow.ai"
 
 # Build-time environment
 ENV NODE_ENV=development
 WORKDIR /build
 
-# Clone source
-RUN git clone --depth 1 --branch main https://github.com/BerriAI/litellm.git .
-
-# Build UI (Dashboard)
+# Clone source, Build UI (Dashboard) & Build Python wheel in one RUN layer
 RUN set -eux \
+ && git clone --depth 1 --branch main https://github.com/BerriAI/litellm.git . \
  && cd ui/litellm-dashboard \
  && npm install \
  && npm run build \
- && mkdir -p ../../litellm/proxy/_experimental/out \
- && cp -r out/* ../../litellm/proxy/_experimental/out/
-
-# Build Python wheel
-RUN set -eux \
+ && mkdir -pv ../../litellm/proxy/_experimental/out \
+ && cp -r out/* ../../litellm/proxy/_experimental/out/ \
+ && cd /build \
  && python3 -m pip install --upgrade pip build \
  && python3 -m build --wheel --outdir dist
 
@@ -34,28 +31,24 @@ FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG}
 LABEL maintainer="postmaster@labnow.ai"
 
 # Production environment
-ENV NODE_ENV=production
-ENV LITELLM_HOME=/root/workspace
+ENV HOME_LITELLM=/opt/litellm
 ENV PATH="/opt/node/bin:/opt/conda/bin:/root/.local/bin:${PATH}"
-ENV HOME=/root/workspace
 
-WORKDIR /root/workspace
+WORKDIR ${HOME_LITELLM}
 
-# Copy utilities and tools
+# Copy utilities, tools and build artifacts
 COPY work /opt/utils/
-RUN chmod +x /opt/utils/*.sh && cp /opt/utils/start-litellm.sh /usr/local/bin/start-litellm.sh
-
-# Copy build artifacts from builder
 COPY --from=builder /build/dist/*.whl /tmp/
 
-# Install Runtime dependencies
+# Install Runtime dependencies and configure tools
 RUN set -eux \
+ && chmod +x /opt/utils/*.sh \
+ && ln -sf /opt/utils/start-litellm.sh /usr/local/bin/start-litellm.sh \
  && pip install --no-cache-dir /tmp/*.whl \
  && pip install --no-cache-dir 'litellm[proxy]' \
  ## Install supervisord (Go version) if needed or use simple entrypoint
  && source /opt/utils/script-setup-sys.sh && setup_supervisord \
- && source /opt/utils/script-utils.sh && install_apt /opt/utils/install_list_litellm.apt \
- && install__clean \
+ && source /opt/utils/script-utils.sh && install__clean \
  && rm -rf /tmp/*.whl
 
 # Data persistence

docker_litellm/work/start-litellm.sh

@@ -2,11 +2,11 @@
 set -eu
 
 # Setup workspace directory
-LITELLM_HOME="${LITELLM_HOME:-/root/workspace}"
-mkdir -p "$LITELLM_HOME"
+HOME_LITELLM="${HOME_LITELLM:-/opt/litellm}"
+mkdir -p "$HOME_LITELLM"
 
-export HOME="$LITELLM_HOME"
-cd "$LITELLM_HOME"
+export HOME="$HOME_LITELLM"
+cd "$HOME_LITELLM"
 
 # Default config if not exists
 if [ ! -f "config.yaml" ]; then
@@ -19,14 +19,14 @@ model_list:
 EOF
 fi
 
-# If arguments are passed, route them
-if [ $# -gt 0 ]; then
-    if command -v "$1" >/dev/null 2>&1; then
-        exec "$@"
-    else
-        exec litellm "$@"
-    fi
+# If no arguments are passed, start litellm proxy with defaults
+if [ $# -eq 0 ]; then
+    set -- --config config.yaml --port 4000 --host 0.0.0.0
 fi
 
-# No arguments: start litellm proxy
-exec litellm --config config.yaml --port 4000 --host 0.0.0.0
+# Route execution: run command directly if it exists, otherwise wrap with litellm
+if command -v "$1" >/dev/null 2>&1; then
+    exec "$@"
+else
+    exec litellm "$@"
+fi

docker_openclaw/demo/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - PROFILE_LOCALIZE=aliyun-pub
       - OPENCLAW_GATEWAY_TOKEN=openclaw
     volumes:
-      - /data/openclaw:/opt/openclaw/data
+      - ${HOME}/openclaw:/root/.openclaw/data
     ports:
       - "${OPENCLAW_GATEWAY_PORT:-18789}:18789"
       - "${OPENCLAW_BRIDGE_PORT:-18790}:18790"