Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker_app_clash/clash.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
18 changes: 9 additions & 9 deletions docker_app_clash/work/clash/script-setup-clash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion docker_devbox/work/script-devbox-jupyter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;
}