From e9396bf6af258af764571deea27b5f48e22d5ebc Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Wed, 27 Aug 2025 02:22:09 +0800 Subject: [PATCH 1/3] Update script-setup-clash.sh - prepare for zashboard --- docker_app_clash/work/clash/script-setup-clash.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker_app_clash/work/clash/script-setup-clash.sh b/docker_app_clash/work/clash/script-setup-clash.sh index efab7f6..31bf256 100644 --- a/docker_app_clash/work/clash/script-setup-clash.sh +++ b/docker_app_clash/work/clash/script-setup-clash.sh @@ -34,12 +34,12 @@ 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 \ +setup_clash_zashboard() { + # Install the latest release: https://github.com/Zephyruso/zashboard + VER_ZASHBOARD=$(curl -sL https://github.com/clash-verge-rev/clash-verge-rev/releases.atom | grep 'releases/tag/v' | head -1 | grep -Po '\d[\d.]+' ) \ + && URL_ZASHBOARD="https://github.com/clash-verge-rev/clash-verge-rev/archive/refs/tags/v$ZASHBOARD.tar.gz" \ + && echo "Downloading clash-verge version ${VER_ZASHBOARD} from: ${URL_ZASHBOARD}" \ + && install_tar_gz $URL_ZASHBOARD \ && mv /opt/clash-verge-* /tmp/verge && cd /tmp/verge \ && jq '.homepage = "./ui"' package.json > tmp.$$.json && mv tmp.$$.json package.json \ && npx pnpm i && npx pnpm run web:build && ls -alh \ From f8ded0e61dab034ea154a419ace895d2a243dbfe Mon Sep 17 00:00:00 2001 From: haobibo Date: Wed, 5 Nov 2025 15:24:24 +0800 Subject: [PATCH 2/3] update ui build --- docker_app_clash/work/clash/script-setup-clash.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker_app_clash/work/clash/script-setup-clash.sh b/docker_app_clash/work/clash/script-setup-clash.sh index 31bf256..b29b62e 100644 --- a/docker_app_clash/work/clash/script-setup-clash.sh +++ b/docker_app_clash/work/clash/script-setup-clash.sh @@ -36,12 +36,12 @@ setup_clash_metacubexd() { setup_clash_zashboard() { # Install the latest release: https://github.com/Zephyruso/zashboard - VER_ZASHBOARD=$(curl -sL https://github.com/clash-verge-rev/clash-verge-rev/releases.atom | grep 'releases/tag/v' | head -1 | grep -Po '\d[\d.]+' ) \ - && URL_ZASHBOARD="https://github.com/clash-verge-rev/clash-verge-rev/archive/refs/tags/v$ZASHBOARD.tar.gz" \ - && echo "Downloading clash-verge version ${VER_ZASHBOARD} from: ${URL_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/clash-verge-* /tmp/verge && cd /tmp/verge \ + && 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 } From 65dedc255f78c43d340517c2b09aa081016e8b1a Mon Sep 17 00:00:00 2001 From: haobibo Date: Wed, 5 Nov 2025 15:28:55 +0800 Subject: [PATCH 3/3] debug build --- docker_app_clash/clash.Dockerfile | 4 ++-- docker_devbox/work/script-devbox-jupyter.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker_app_clash/clash.Dockerfile b/docker_app_clash/clash.Dockerfile index a2c00dd..26fa3c3 100644 --- a/docker_app_clash/clash.Dockerfile +++ b/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/ diff --git a/docker_devbox/work/script-devbox-jupyter.sh b/docker_devbox/work/script-devbox-jupyter.sh index 9875fb6..ea386ea 100644 --- a/docker_devbox/work/script-devbox-jupyter.sh +++ b/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 ; }