Merge pull request #799 from Hi-Windom/v0.35

集成 jupyter-binder-python #650

.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",

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<[email protected]>"
 
-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" ]

Doker_entry.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+/opt/Sillot/kernel $SILLOT_ARGS_KERNEL &
+jupyter lab $SILLOT_ARGS_JUPYTER

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",

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",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Sillot-workspace",
-  "version": "0.35.2294",
+  "version": "0.35.2295",
   "description": "汐洛 pnpm 工作区",
   "packageManager": "[email protected]",
   "scripts": {