Jetty update

README.md

@@ -10,8 +10,8 @@ To clone this repo and get started, run:
 ```
 git clone https://github.com/deephaven-examples/deephaven-matplotlib-base.git
 cd deephaven-matplotlib-base
-docker-compose pull
-docker-compose up  --build -d
+docker compose pull
+docker compose up --build -d
 ```
 
 This starts the Deephaven IDE with all the needed packages.

data/storage/notebooks/1_example.py

@@ -0,0 +1,12 @@
+import matplotlib.pyplot as plt
+
+plt.figure()
+x = [0, 2, 4, 6]
+y = [1, 3, 4, 8]
+plt.plot(x, y)
+plt.xlabel("x values")
+plt.ylabel("y values")
+plt.title("plotted x and y values")
+plt.legend(["line 1"])
+
+m_figure = plt.gcf()

data/notebooks/2example.py → data/storage/notebooks/2_example.py

@@ -3,7 +3,7 @@
 import math
 
 # Get the angles from 0 to 2 pie (360 degree) in narray object
-X = np.arange(0, math.pi*2, 0.05)
+X = np.arange(0, math.pi * 2, 0.05)
 
 # Using built-in trigonometric function we can directly plot
 # the given cosine wave for the given angles

docker-compose.yml

@@ -1,48 +1,9 @@
-version: "3.4"
+version: "3"
 
 services:
   server:
     build: ./server
-    expose:
-      - '8080'
     volumes:
       - ./data:/data
-      - api-cache:/cache
-    environment:
-      - JAVA_TOOL_OPTIONS=-Xmx4g -Ddeephaven.console.type=python
-
-  web:
-    build: ./web
-    expose:
-      - '80'
-    volumes:
-      - ./data:/data
-      - web-tmp:/tmp
-
-  grpc-proxy:
-    image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest}
-    environment:
-      - BACKEND_ADDR=server:8080
-    depends_on:
-      - server
-    expose:
-      - '8080'
-
-  envoy:
-    image: ghcr.io/deephaven/envoy:${VERSION:-latest}
-    depends_on:
-      - web
-      - grpc-proxy
-      - server
     ports:
-      - "${DEEPHAVEN_PORT:-10000}:10000"
-
-  examples:
-    image: ghcr.io/deephaven/examples:latest
-    volumes:
-      - ./data:/data
-    command: initialize
-
-volumes:
-    web-tmp:
-    api-cache:
+      - "10000:10000"

server/Dockerfile

@@ -1,3 +1,9 @@
-FROM ghcr.io/deephaven/server:${VERSION:-latest}
-# pip install any of the plugins required on the server
-RUN pip install deephaven-plugin-matplotlib
+# syntax=docker/dockerfile:1.4
+
+FROM ghcr.io/deephaven/web-plugin-packager:latest as build
+RUN ./pack-plugins.sh @deephaven/js-plugin-matplotlib
+
+FROM ghcr.io/deephaven/server:latest
+RUN pip install --no-cache-dir deephaven-plugin-matplotlib
+COPY --link --from=build js-plugins/ /opt/deephaven/config/js-plugins/
+COPY --link deephaven.prop /opt/deephaven/config/deephaven.prop

server/deephaven.prop

@@ -0,0 +1,5 @@
+includefiles=dh-defaults.prop
+
+deephaven.console.type=python
+
+deephaven.jsPlugins.resourceBase=/opt/deephaven/config/js-plugins