Merge pull request #36 from nebula-contrib/jupyter-notebook

0.4.18: jupyter notebook introduced!
nebula-contrib · Sep 18, 2023 · 78e2668 · 78e2668
2 parents a7f8dd2 + b3b71cb
commit 78e2668
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -31,7 +31,7 @@ LABEL org.opencontainers.image.title="NebulaGraph" \
     com.docker.extension.detailed-description="NebulaGraph is a popular Open-Source, distributed Cloud Native Graph Database for trillion edges graph data volume." \
     com.docker.extension.publisher-url="https://github.com/vesoft-inc/nebula" \
     com.docker.extension.additional-urls='[{"title":"WebSite","url":"https://www.nebula-graph.io/"}, {"title":"GitHub","url":"https://github.com/vesoft-inc/nebula"}, {"title":"Slack","url":"http://community-chat.nebula-graph.io/"}, {"title":"Docker Extension Feedback","url":"https://github.com/nebula-contrib/nebulagraph-docker-ext/issues/new/choose"}]' \
-    com.docker.extension.changelog="Fixed gephi container unhealthy" \
+    com.docker.extension.changelog="Introduce NebulaGraph Jupyter" \
     com.docker.desktop.extension.icon="https://user-images.githubusercontent.com/1651790/213339618-107d0e59-1b8b-4c89-bbae-5529aa4e2666.svg" \
     com.docker.extension.categories="database"
 

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -391,6 +391,24 @@ services:
       - ~/.nebulagraph/:/host_data/
     pull_policy: always
 
+  nebulagraph_jupyter:
+    labels:
+      - "com.vesoft.scope=utils"
+    image: 'weygu/nebulagraph-jupyter:v0'
+    container_name: nebulagraph_jupyter
+    restart: always
+    ports:
+      - '28888:8888'
+    volumes:
+      - ~/.nebulagraph/:/home/jovyan
+    healthcheck:
+      test: ["CMD-SHELL", "wget http://127.0.0.1:8888 -O /dev/null --no-http-keep-alive || exit 1"]
+      interval: 300s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+    networks:
+      - nebula-net
 
 networks:
   nebula-net:
diff --git a/ui/src/App.tsx b/ui/src/App.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import Button from '@mui/material/Button';
-import { Insights, Explore, KeyboardArrowRight, AutoAwesome } from '@mui/icons-material';
+import { Insights, LibraryBooks, KeyboardArrowRight, AutoAwesome } from '@mui/icons-material';
 import { createDockerDesktopClient } from '@docker/extension-api-client';
 
 import {
@@ -33,7 +33,7 @@ export function App() {
               }
               endIcon={<Insights />}
             >
-              Studio in Browser
+              Studio
             </Button>
           </Box>
 
@@ -51,6 +51,21 @@ export function App() {
             </Button>
           </Box>
 
+          <span style={{marginRight: 10}}></span>
+
+          <Box>
+            <Button
+              variant="outlined"
+              onClick={() =>
+                ddClient.host.openExternal('http://127.0.0.1:28888?token=nebula')
+              }
+              endIcon={<LibraryBooks />}
+            >
+              Jupyter
+            </Button>
+          </Box>
+
+
           <span style={{marginRight: 10}}></span>
 
           <Box>
@@ -87,7 +102,7 @@ export function App() {
     <Box sx={{ alignItems: 'left', flexDirection: 'column', height: 20, fontSize: 10, justifyContent: 'center'}}>
       <Typography variant="body2" color={(theme) => theme.palette.text.primary} sx={{ my: 2, mr: 6 }}>
       <span style={{marginRight: 10}}></span>
-        NebulaGraph for Docker Desktop Extension 0.4.17, NebulaGraph: v3.6.0, NebulaGraph Studio: v3.7.0
+        NebulaGraph for Docker Desktop Extension 0.4.18, NebulaGraph: v3.6.0, NebulaGraph Studio: v3.7.0
       </Typography>
     </Box>
 

diff --git a/ui/src/components/TabPanel/index.tsx b/ui/src/components/TabPanel/index.tsx
@@ -135,13 +135,13 @@ function homePage() {
               <a href="#"
                 onClick={() => openExternalUrl("https://stackoverflow.com/questions/tagged/nebula-graph")}
               >
-                <img src="https://img.shields.io/badge/Stack%20Overflow-nebula--graph-orange?style=for-the-badge&amp;logo=stack-overflow&amp;logoColor=white" alt="Stack Overflow"/>
+                <img src="https://img.shields.io/badge/SO-nebulagraph-orange?style=for-the-badge&amp;logo=stack-overflow&amp;logoColor=white" alt="Stack Overflow"/>
               </a>
               <span style={{marginRight: 10}}></span>
               <a href="#"
                 onClick={() => openExternalUrl("https://github.com/vesoft-inc/nebula/discussions")}
               >
-                <img src="https://img.shields.io/badge/GitHub_Discussion-000000?style=for-the-badge&amp;logo=github&amp;logoColor=white" alt="Discussions"/>
+                <img src="https://img.shields.io/badge/GH_Discussion-000000?style=for-the-badge&amp;logo=github&amp;logoColor=white" alt="Discussions"/>
               </a>
               <span style={{marginRight: 10}}></span>
               <a href="#"
@@ -660,7 +660,7 @@ export default function NebulaGraphTabs() {
                       onClick={() => openExternalUrl("http://127.0.0.1:17001")}
                       endIcon={<Insights />}
                     >
-                      Studio in Browser
+                      Studio
                     </Button>
                     </Box>
                 </Typography>