Update clash UI (#41)

* Update script-setup-clash.sh - prepare for zashboard

* update ui build

Author: haobibo

docker_app_clash/clash.Dockerfile

@@ -6,12 +6,12 @@ ARG BASE_IMG="atom"
 
 
 # Stage 1: build code, both backend and frontend
-FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG_BUILD} as builder
+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_clash_metacubexd && setup_clash_verge \
+ && setup_clash && setup_clash_metacubexd && setup_clash_zashboard \
  && mv /opt/utils/config.yaml    /opt/clash/config \
  && mv /opt/utils/start-clash.sh /opt/clash/
 

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

@@ -34,14 +34,14 @@ setup_clash_metacubexd() {
   && mv /tmp/xd/dist /opt/clash/ui-xd
 }
 
-setup_clash_verge() {
-    #  Install the latest release: https://clash-verge-rev.github.io/index.html
-     VER_VERGE=$(curl -sL https://github.com/clash-verge-rev/clash-verge-rev/releases.atom | grep 'releases/tag/v' | head -1 | grep -Po '\d[\d.]+' ) \
-  && URL_VERGE="https://github.com/clash-verge-rev/clash-verge-rev/archive/refs/tags/v$VER_VERGE.tar.gz" \
-  && echo "Downloading clash-verge version ${VER_VERGE} from: ${URL_VERGE}" \
-  && install_tar_gz $URL_VERGE \
-  && mv /opt/clash-verge-* /tmp/verge && cd /tmp/verge \
+setup_clash_zashboard() {
+    #  Install the latest release: https://github.com/Zephyruso/zashboard
+     VER_ZASHBOARD=$(curl -sL https://github.com/Zephyruso/zashboard/releases.atom | grep 'releases/tag/v' | head -1 | grep -Po '\d[\d.]+' ) \
+  && URL_ZASHBOARD="https://github.com/Zephyruso/zashboard/archive/refs/tags/v$VER_ZASHBOARD.tar.gz" \
+  && echo "Downloading zashboard version ${VER_ZASHBOARD} from: ${URL_ZASHBOARD}" \
+  && install_tar_gz $URL_ZASHBOARD \
+  && mv /opt/zashboard-* /tmp/zashboard && cd /tmp/zashboard \
   && 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-verge
+  && npx pnpm i && npx pnpm run build && ls -alh \
+  && mv /tmp/zashboard/dist /opt/clash/ui-zashboard
 }

docker_devbox/work/script-devbox-jupyter.sh

@@ -108,7 +108,7 @@ setup_jupyter_hub() {
    && pip install -Uq oauthenticator jupyterhub-ldapauthenticator jupyterhub-kerberosauthenticator \
    && pip install -Uq dockerspawner jupyterhub-kubespawner jupyterhub-systemdspawner wrapspawner \
    && pip install -Uq psutil pycurl jupyter_client jupyterhub \
-   && pip install -Uq jupyterhub-traefik-proxy
+   && pip install -Uq jupyterhub-traefik-proxy configurable-http-proxy
 
    type jupyterhub && echo "@ JupyterHub version: $(jupyterhub --version)" || return -1 ;
 }