Upgrade to Jetty images (#2945)

* Update docker-compose files to use jetty image, remove use of `notebook` and `reverse-proxy` services * netty to jetty, also remove traefik label from all files * Add deephaven port and remove jetty from names, as there is no jetty suffix * Add port 6006 to TensorFlow and PyTorch examples for TensorBoard support * Add latest tag to examples containers
deephaven · Oct 12, 2022 · 9034a48 · 9034a48
1 parent e582a42
commit 9034a48
Show file tree

Hide file tree

Showing 15 changed files with 70 additions and 549 deletions.
diff --git a/containers/groovy-examples/docker-compose.yml b/containers/groovy-examples/docker-compose.yml
@@ -1,49 +1,17 @@
 version: "3.4"
 
 services:
-  server:
-    image: ghcr.io/deephaven/server:${VERSION:-latest}
-    expose:
-      - '8080'
+  deephaven:
+    image: ghcr.io/deephaven/server-slim:latest
+    ports:
+      - "${DEEPHAVEN_PORT:-10000}:10000"
     volumes:
       - ./data:/data
-      - api-cache:/cache
     environment:
-      - JAVA_TOOL_OPTIONS=-Xmx4g -Ddeephaven.console.type=groovy
-
-  web:
-    image: ghcr.io/deephaven/web:${VERSION:-latest}
-    expose:
-      - '8080'
-    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"
+      - JAVA_OPTS=-Xmx4g
 
   examples:
-    image: ghcr.io/deephaven/examples
+    image: ghcr.io/deephaven/examples:latest
     volumes:
       - ./data:/data
     command: initialize
-
-volumes:
-    web-tmp:
-    api-cache:
-
diff --git a/containers/groovy/docker-compose.yml b/containers/groovy/docker-compose.yml
@@ -1,43 +1,11 @@
 version: "3.4"
 
 services:
-  server:
-    image: ghcr.io/deephaven/server:${VERSION:-latest}
-    expose:
-      - '8080'
+  deephaven:
+    image: ghcr.io/deephaven/server-slim:latest
+    ports:
+      - "${DEEPHAVEN_PORT:-10000}:10000"
     volumes:
       - ./data:/data
-      - api-cache:/cache
     environment:
-      - JAVA_TOOL_OPTIONS=-Xmx4g -Ddeephaven.console.type=groovy
-
-  web:
-    image: ghcr.io/deephaven/web:${VERSION:-latest}
-    expose:
-      - '8080'
-    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"
-
-volumes:
-    web-tmp:
-    api-cache:
-
+      - JAVA_OPTS=-Xmx4g
diff --git a/containers/python-examples-redpanda/docker-compose.yml b/containers/python-examples-redpanda/docker-compose.yml
@@ -1,49 +1,21 @@
 version: "3.4"
 
 services:
-  server:
-    image: ghcr.io/deephaven/server:${VERSION:-latest}
-    expose:
-      - '8080'
+  deephaven:
+    image: ghcr.io/deephaven/server:latest
+    ports:
+      - "${DEEPHAVEN_PORT:-10000}:10000"
     volumes:
       - ./data:/data
-      - api-cache:/cache
     environment:
-      - JAVA_TOOL_OPTIONS=-Xmx4g -Ddeephaven.console.type=python
-
-  web:
-    image: ghcr.io/deephaven/web:${VERSION:-latest}
-    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"
+      - JAVA_OPTS=-Xmx4g
 
   examples:
     image: ghcr.io/deephaven/examples
     volumes:
       - ./data:/data
     command: initialize
 
-
   redpanda:
     command:
     - redpanda
@@ -75,8 +47,3 @@ services:
       KAFKA_BOOTSTRAP_SERVERS: redpanda:9092
       APPLICATION_ID: registry_id
       APPLICATION_SERVER: localhost:9000
-
-volumes:
-    web-tmp:
-    api-cache:
-
diff --git a/containers/python-examples/All-AI/docker-compose.yml b/containers/python-examples/All-AI/docker-compose.yml
@@ -1,50 +1,17 @@
 version: "3.4"
 
 services:
-  server:
-    image: ghcr.io/deephaven/server-all-ai:${VERSION:-latest}
-    expose:
-      - '8080'
-    volumes:
-      - ./data:/data
-      - api-cache:/cache
-    environment:
-      - JAVA_TOOL_OPTIONS=-Xmx4g -Ddeephaven.console.type=python
+  deephaven:
+    image: ghcr.io/deephaven/server-all-ai:latest
     ports:
-      - 6006:6006
-
-  web:
-    image: ghcr.io/deephaven/web:${VERSION:-latest}
-    expose:
-      - '8080'
+      - "${DEEPHAVEN_PORT:-10000}:10000"
     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"
+      - JAVA_OPTS=-Xmx4g
 
   examples:
     image: ghcr.io/deephaven/examples:latest
     volumes:
       - ./data:/data
     command: initialize
-
-volumes:
-    web-tmp:
-    api-cache:
diff --git a/containers/python-examples/NLTK/docker-compose.yml b/containers/python-examples/NLTK/docker-compose.yml
@@ -1,48 +1,17 @@
 version: "3.4"
 
 services:
-  server:
-    image: ghcr.io/deephaven/server-nltk:${VERSION:-latest}
-    expose:
-      - '8080'
+  deephaven:
+    image: ghcr.io/deephaven/server-nltk:latest
+    ports:
+      - "${DEEPHAVEN_PORT:-10000}:10000"
     volumes:
       - ./data:/data
-      - api-cache:/cache
     environment:
-      - JAVA_TOOL_OPTIONS=-Xmx4g -Ddeephaven.console.type=python
-
-  web:
-    image: ghcr.io/deephaven/web:${VERSION:-latest}
-    expose:
-      - '8080'
-    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"
+      - JAVA_OPTS=-Xmx4g
 
   examples:
     image: ghcr.io/deephaven/examples:latest
     volumes:
       - ./data:/data
     command: initialize
-
-volumes:
-    web-tmp:
-    api-cache:
diff --git a/containers/python-examples/PyTorch/docker-compose.yml b/containers/python-examples/PyTorch/docker-compose.yml
@@ -1,50 +1,18 @@
 version: "3.4"
 
 services:
-  server:
-    image: ghcr.io/deephaven/server-pytorch:${VERSION:-latest}
-    expose:
-      - '8080'
-    volumes:
-      - ./data:/data
-      - api-cache:/cache
-    environment:
-      - JAVA_TOOL_OPTIONS=-Xmx4g -Ddeephaven.console.type=python
+  deephaven:
+    image: ghcr.io/deephaven/server-pytorch:latest
     ports:
+      - "${DEEPHAVEN_PORT:-10000}:10000"
       - 6006:6006
-
-  web:
-    image: ghcr.io/deephaven/web:${VERSION:-latest}
-    expose:
-      - '8080'
     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"
+      - JAVA_OPTS=-Xmx4g
 
   examples:
     image: ghcr.io/deephaven/examples:latest
     volumes:
       - ./data:/data
     command: initialize
-
-volumes:
-    web-tmp:
-    api-cache:
diff --git a/containers/python-examples/SciKit-Learn/docker-compose.yml b/containers/python-examples/SciKit-Learn/docker-compose.yml
@@ -1,48 +1,17 @@
 version: "3.4"
 
 services:
-  server:
-    image: ghcr.io/deephaven/server-sklearn:${VERSION:-latest}
-    expose:
-      - '8080'
+  deephaven:
+    image: ghcr.io/deephaven/server-sklearn:latest
+    ports:
+      - "${DEEPHAVEN_PORT:-10000}:10000"
     volumes:
       - ./data:/data
-      - api-cache:/cache
     environment:
-      - JAVA_TOOL_OPTIONS=-Xmx4g -Ddeephaven.console.type=python
-
-  web:
-    image: ghcr.io/deephaven/web:${VERSION:-latest}
-    expose:
-      - '8080'
-    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"
+      - JAVA_OPTS=-Xmx4g
 
   examples:
     image: ghcr.io/deephaven/examples:latest
     volumes:
       - ./data:/data
     command: initialize
-
-volumes:
-    web-tmp:
-    api-cache: