update ui

docker_app_clash/clash.Dockerfile

@@ -1,12 +1,23 @@
-FROM qpod/go-stack AS builder
+# Distributed under the terms of the Modified BSD License.
+
+ARG BASE_NAMESPACE
+ARG BASE_IMG_BUILD="go-stack"
+ARG BASE_IMG="atom"
+
+
+# Stage 1: build code, both backend and frontend
+FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG_BUILD} as builder
 
 COPY work/clash /opt/utils/
 
 RUN set -eux && source /opt/utils/script-setup-clash.sh \
  && setup_clash && setup_verge \
  && mv /opt/utils/config.yaml /opt/clash/config
 
-FROM qpod/atom
+
+# Stage 2: runtime image, copy files from builder image
+FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG}
+
 COPY --from=builder /opt/clash /opt/clash
 WORKDIR /opt/clash
 RUN set -eux \

docker_app_clash/work/clash/config.yaml

@@ -1,16 +1,17 @@
 # ref: https://github.com/MetaCubeX/mihomo/blob/Alpha/docs/config.yaml
 
 mixed-port: 57890
-external-controller: :59090
-allow-lan: true
-bind-address: '*'
-log-level: debug
-mode: Rule
 
+external-controller: 0.0.0.0:59090
 external-ui: /opt/clash/ui
 external-ui-name: xd
 external-ui-url: "https://github.com/MetaCubeX/metacubexd/archive/refs/heads/gh-pages.zip"
 
+allow-lan: true
+bind-address: '*'
+log-level: debug
+mode: Rule
+
 rules:
  - DOMAIN-SUFFIX,local,DIRECT
  - IP-CIDR,192.168.0.0/16,DIRECT,no-resolve

docker_app_clash/work/clash/script-setup-clash.sh

@@ -28,6 +28,7 @@ setup_verge() {
   && echo "Downloading clash-verge version ${VER_VERGE} from: ${URL_VERGE}" \
   && install_tar_gz $URL_VERGE \
   && mv /opt/clash-verge-* /tmp/verge && cd /tmp/verge \
-  && npm i && npm run web:build && ls -alh \
+  && jq '.homepage = "./ui"' package.json > tmp.$$.json && mv tmp.$$.json package.json \
+  && npx pnpm i && npx pnpm run web:build && ls -alh \
   && mv /tmp/verge/dist /opt/clash/ui
 }