diff --git a/.vscode/extensions/Sillot/package.json b/.vscode/extensions/Sillot/package.json index 8135f000a2..97b6985fd7 100644 --- a/.vscode/extensions/Sillot/package.json +++ b/.vscode/extensions/Sillot/package.json @@ -2,7 +2,7 @@ "name": "sillot", "displayName": "汐洛 Sillot", "description": "汐洛彖夲肜矩阵(Sillot T☳Converbenk Matrix)为智慧新彖务服务。此插件为汐洛官方插件,提供多功能一体化集成。", - "version": "0.35.2294", + "version": "0.35.2295", "preview": true, "repository": "https://github.com/Hi-Windom/Sillot", "publisher": "Hi-Windom", diff --git a/Dockerfile b/Dockerfile index 3856bf26e7..ffe3f728a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,7 @@ RUN apt-get update && \ mv /Hi-Windom/Sillot/app/guide/ /opt/Sillot/ && \ mv /Hi-Windom/Sillot/app/changelogs/ /opt/Sillot/ && \ mv /Hi-Windom/Sillot/kernel/kernel /opt/Sillot/ && \ + mv /Hi-Windom/Sillot/Docker_entry.sh /opt/Sillot/ && \ find /opt/Sillot/ -name .git | xargs rm -rf FROM soltus/jupyter-binder-python:latest @@ -51,12 +52,13 @@ RUN sudo apt-get update && \ sudo rm -rf /var/lib/apt/lists/* RUN sudo chown -R root:root /opt/Sillot/ -RUN sudo chmod +x /opt/Sillot/kernel /usr/local/bin/deno /tini +RUN sudo chmod +x /opt/Sillot/kernel /usr/local/bin/deno /tini /opt/Sillot/docker-sillot-entrypoint.sh ENV TZ=Asia/Shanghai ENV RUN_IN_CONTAINER=true EXPOSE 58131 LABEL maintainer="Soltus<694357845@qq.com>" -ENTRYPOINT [ "/tini", "--" ] -CMD ["sh", "-c", "/opt/Sillot/kernel & jupyter lab --port=8888 --ip=* --no-browser --allow-root"] +ENV SILLOT_ARGS_KERNEL="--accessAuthCode 58131" +ENV SILLOT_ARGS_JUPYTER="--port=8888 --ip=* --no-browser --allow-root" +ENTRYPOINT [ "/tini", "--", "/opt/Sillot/docker-sillot-entrypoint.sh" ] diff --git a/Doker_entry.sh b/Doker_entry.sh new file mode 100644 index 0000000000..bd4fb936f6 --- /dev/null +++ b/Doker_entry.sh @@ -0,0 +1,3 @@ +#!/bin/bash +/opt/Sillot/kernel $SILLOT_ARGS_KERNEL & +jupyter lab $SILLOT_ARGS_JUPYTER diff --git a/app/package.json b/app/package.json index ec777cf721..68d33872ff 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "sillot", - "version": "0.35.2294", + "version": "0.35.2295", "syv": "3.1.0", "sypv": "[3.0.16]", "description": "Build Your Eternal Digital Garden", diff --git a/docs/starlight/package.json b/docs/starlight/package.json index 46828ac353..d073c9e45b 100644 --- a/docs/starlight/package.json +++ b/docs/starlight/package.json @@ -1,7 +1,7 @@ { "name": "starlight", "type": "module", - "version": "0.35.2294", + "version": "0.35.2295", "scripts": { "test": "echo 'Test your sister day by day'", "dev": "astro dev", diff --git a/package.json b/package.json index 8904372712..1413c6559c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Sillot-workspace", - "version": "0.35.2294", + "version": "0.35.2295", "description": "汐洛 pnpm 工作区", "packageManager": "pnpm@9.1.4", "scripts": {