Switch over developer prepareCompose workflow to jetty

.env

@@ -6,4 +6,4 @@ COMPOSE_PROJECT_NAME=core
 DEEPHAVEN_PORT=10000
 DEEPHAVEN_CONSOLE_TYPE=python
 DEEPHAVEN_APPLICATION_DIR=/data/app.d
-DEEPHAVEN_SERVER_IMAGE=deephaven/server:local-build
+DEEPHAVEN_SERVER_IMAGE=deephaven/server-jetty:local-build

.github/workflows/build-ci.yml

@@ -51,7 +51,7 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: |
-            ghcr.io/${{ github.repository_owner }}/server
+            ghcr.io/${{ github.repository_owner }}/server-netty
           flavor: |
             latest=false
           tags: |
@@ -65,7 +65,7 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: |
-            ghcr.io/${{ github.repository_owner }}/server-nltk
+            ghcr.io/${{ github.repository_owner }}/server-nltk-netty
           flavor: |
             latest=false
           tags: |
@@ -79,7 +79,7 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: |
-            ghcr.io/${{ github.repository_owner }}/server-pytorch
+            ghcr.io/${{ github.repository_owner }}/server-pytorch-netty
           flavor: |
             latest=false
           tags: |
@@ -93,7 +93,7 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: |
-            ghcr.io/${{ github.repository_owner }}/server-sklearn
+            ghcr.io/${{ github.repository_owner }}/server-sklearn-netty
           flavor: |
             latest=false
           tags: |
@@ -107,7 +107,7 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: |
-            ghcr.io/${{ github.repository_owner }}/server-tensorflow
+            ghcr.io/${{ github.repository_owner }}/server-tensorflow-netty
           flavor: |
             latest=false
           tags: |
@@ -121,7 +121,7 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: |
-            ghcr.io/${{ github.repository_owner }}/server-all-ai
+            ghcr.io/${{ github.repository_owner }}/server-all-ai-netty
           flavor: |
             latest=false
           tags: |
@@ -135,7 +135,7 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: |
-            ghcr.io/${{ github.repository_owner }}/server-slim
+            ghcr.io/${{ github.repository_owner }}/server-slim-netty
           flavor: |
             latest=false
           tags: |
@@ -179,7 +179,7 @@ jobs:
         with:
           build-args: |
             BASE=deephaven/server-base:local-build
-            SERVER=server
+            SERVER=server-netty
             DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
           tags: ${{ steps.docker_meta_server.outputs.tags }}
           builder: ${{ steps.buildx.outputs.name }}
@@ -191,7 +191,7 @@ jobs:
         with:
           build-args: |
             BASE=deephaven/nltk-base:local-build
-            SERVER=server-nltk
+            SERVER=server-nltk-netty
             DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
           tags: ${{ steps.docker_meta_server_nltk.outputs.tags }}
           builder: ${{ steps.buildx.outputs.name }}
@@ -203,7 +203,7 @@ jobs:
         with:
           build-args: |
             BASE=deephaven/pytorch-base:local-build
-            SERVER=server-pytorch
+            SERVER=server-pytorch-netty
             DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
           tags: ${{ steps.docker_meta_server_pytorch.outputs.tags }}
           builder: ${{ steps.buildx.outputs.name }}
@@ -215,7 +215,7 @@ jobs:
         with:
           build-args: |
             BASE=deephaven/sklearn-base:local-build
-            SERVER=server-sklearn
+            SERVER=server-sklearn-netty
             DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
           tags: ${{ steps.docker_meta_server_sklearn.outputs.tags }}
           builder: ${{ steps.buildx.outputs.name }}
@@ -227,7 +227,7 @@ jobs:
         with:
           build-args: |
             BASE=deephaven/tensorflow-base:local-build
-            SERVER=server-tensorflow
+            SERVER=server-tensorflow-netty
             DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
           tags: ${{ steps.docker_meta_server_tensorflow.outputs.tags }}
           builder: ${{ steps.buildx.outputs.name }}
@@ -239,7 +239,7 @@ jobs:
         with:
           build-args: |
             BASE=deephaven/all-ai-base:local-build
-            SERVER=server-all-ai
+            SERVER=server-all-ai-netty
             DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
           tags: ${{ steps.docker_meta_server_all_ai.outputs.tags }}
           builder: ${{ steps.buildx.outputs.name }}

Integrations/build.gradle

@@ -57,15 +57,15 @@ def runInDocker = { String name, String sourcePath, List<String> command, Closur
                 into 'python/configs'
             }
         }
-        parentContainers = [project(':docker-server').tasks.findByName('buildDocker-server')] // deephaven/server
+        parentContainers = [project(':docker-server').tasks.findByName('buildDocker-server-netty')] // deephaven/server-netty
 
         imageName = 'deephaven/py-integrations:local-build'
 
         addConfig(it)
 
         dockerfile {
             // set up the container, env vars - things that aren't likely to change
-            from 'deephaven/server:local-build'
+            from 'deephaven/server-netty:local-build'
             runCommand '''set -eux; \\
                       pip3 install unittest-xml-reporting==3.0.4;\\
                       mkdir -p /out/report;\\

build.gradle

@@ -59,11 +59,7 @@ tasks.register('nightly') {
 tasks.register('prepareCompose') {
     it.group 'Deephaven lifecycle'
     it.description 'A lifecycle task that prepares prerequisites for local docker-compose builds'
-    it.dependsOn project(':docker-server-slim').tasks.findByName('buildDocker-server-slim'),
-            project(':docker-server').tasks.findByName('buildDocker-server'),
-            project(':docker-web').tasks.findByName('buildDocker'),
-            project(':envoy').tasks.findByName('buildDocker'),
-            project(':grpc-proxy').tasks.findByName('buildDocker-grpc-proxy')
+    it.dependsOn project(':docker-server-jetty').tasks.findByName('buildDocker-server-jetty')
 }
 
 tasks.register('smoke') {
@@ -77,6 +73,7 @@ tasks.register('smoke') {
     it.dependsOn project(':server').tasks.findByName(LifecycleBasePlugin.CHECK_TASK_NAME)
     it.dependsOn project(':docker-server-slim').tasks.findByName('prepareDocker')
     it.dependsOn project(':docker-server').tasks.findByName('prepareDocker')
+    it.dependsOn project(':docker-server-jetty').tasks.findByName('prepareDocker')
     it.dependsOn project(':web').tasks.findByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME)
     it.dependsOn project(':Generators').tasks.findByName(LifecycleBasePlugin.CHECK_TASK_NAME)
 }

buildSrc/src/main/groovy/io/deephaven/tools/docker/DeephavenInDockerExtension.groovy

@@ -45,7 +45,7 @@ public abstract class DeephavenInDockerExtension {
         // irritating configuration order of operations to work out here, so just leaving
         // these as constants until we decide they aren't any more
         deephavenServerProject = ':docker-server'
-        serverTask = 'buildDocker-server'
+        serverTask = 'buildDocker-server-netty'
         def serverProject = project.evaluationDependsOn(deephavenServerProject)
 
         def createDeephavenGrpcApiNetwork = project.tasks.register('createDeephavenGrpcApiNetwork', DockerCreateNetwork) { task ->

debezium/demo/.env

@@ -2,7 +2,7 @@ COMPOSE_PROJECT_NAME=core-debezium-demo
 DEEPHAVEN_PORT=10000
 DEEPHAVEN_CONSOLE_TYPE=python
 DEEPHAVEN_APPLICATION_DIR=/data/app.d
-DEEPHAVEN_SERVER_IMAGE=deephaven/server:local-build
+DEEPHAVEN_SERVER_IMAGE=deephaven/server-jetty:local-build
 DEBEZIUM_VERSION=1.4
 REDPANDA_VERSION=v21.9.5
 REDPANDA_MEMORY=1G

debezium/demo/docker-compose.yml

@@ -12,34 +12,6 @@ services:
       - ../scripts:/scripts
       - ./logs:/logs
 
-  web:
-    extends:
-      file: ../../docker-compose-common.yml
-      service: web
-
-  # Should only be used for non-production deployments, see grpc-proxy/README.md for more info
-  grpc-proxy:
-    extends:
-      file: ../../docker-compose-common.yml
-      service: grpc-proxy
-    depends_on:
-      server:
-        condition: service_healthy
-
-  envoy:
-    # A reverse proxy configured for no SSL on localhost. It fronts the requests
-    # for the static content and the websocket proxy.
-    extends:
-      file: ../../docker-compose-common.yml
-      service: envoy
-    depends_on:
-      server:
-        condition: service_healthy
-      grpc-proxy:
-        condition: service_started
-      web:
-        condition: service_started
-
   redpanda:
     extends:
       file: ../docker-compose-debezium-common.yml

docker-compose-common.yml

@@ -14,21 +14,19 @@ services:
       # with max memory.
       #
       # To turn on debug logging, add: -Dlogback.configurationFile=logback-debug.xml
-      - JAVA_TOOL_OPTIONS=-Xmx4g -Ddeephaven.console.type=${DEEPHAVEN_CONSOLE_TYPE} -Ddeephaven.application.dir=${DEEPHAVEN_APPLICATION_DIR} -Dstorage.path=/data
+      - JAVA_TOOL_OPTIONS=-Xmx4g -Ddeephaven.console.type=${DEEPHAVEN_CONSOLE_TYPE} -Ddeephaven.application.dir=${DEEPHAVEN_APPLICATION_DIR}
       #
       # For remote debugging switch the line above for the one below (and also change the ports below)
       # - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -Xmx4g -Ddeephaven.console.type=${DEEPHAVEN_CONSOLE_TYPE} -Ddeephaven.application.dir=${DEEPHAVEN_APPLICATION_DIR}
       #
       # For jprofiler sessions (if you tweaked the jprofiler version in jprofiler-server/Dockerfile you need to tweak path)
       # - JAVA_TOOL_OPTIONS=-agentpath:/opt/jprofiler13.0/bin/linux-x64/libjprofilerti.so=port=8849,nowait -Xmx4g -Ddeephaven.console.type=${DEEPHAVEN_CONSOLE_TYPE} -Ddeephaven.application.dir=${DEEPHAVEN_APPLICATION_DIR}
 
-    expose:
-      - '8080'
+    ports:
+      - '10000:10000'
 # For remote debugging (change if using different port)
-#    ports:
 #      - '5005:5005'
 # For jprofiler (change if using different port)
-#    ports:
 #      - '8849:8849'
 
     # Note: using old-style volume mounts, so that the directories get created if they don't exist
@@ -50,42 +48,3 @@ services:
     # $ docker exec core_server_1 tc qdisc add dev eth0 root netem delay 10ms
     cap_add:
       - SYS_PTRACE
-
-  web:
-    image: deephaven/web:local-build
-    expose:
-      - "8080"
-    volumes:
-      - ./data:/data
-    deploy:
-      resources:
-        limits:
-          cpus: '1'
-          memory: 256M
-
-  # Should only be used for non-production deployments, see grpc-proxy/README.md for more info
-  grpc-proxy:
-    image: deephaven/grpc-proxy:local-build
-    environment:
-      - BACKEND_ADDR=server:8080
-    expose:
-      - '8080'
-#      - '8443' #unused
-    deploy:
-      resources:
-        limits:
-          cpus: '1'
-          memory: 256M
-
-  envoy:
-    # A reverse proxy configured for no SSL on localhost. It fronts the requests
-    # for the static content and the websocket proxy.
-    image: deephaven/envoy:local-build
-    ports:
-      - "${DEEPHAVEN_PORT}:10000"
-#      - '9090:9090' #envoy admin
-    deploy:
-      resources:
-        limits:
-          cpus: '1'
-          memory: 256M

docker-compose.yml

@@ -16,31 +16,3 @@ services:
     extends:
       file: docker-compose-common.yml
       service: server
-
-  web:
-    extends:
-      file: docker-compose-common.yml
-      service: web
-
-  # Should only be used for non-production deployments, see grpc-proxy/README.md for more info
-  grpc-proxy:
-    extends:
-      file: docker-compose-common.yml
-      service: grpc-proxy
-    depends_on:
-      server:
-        condition: service_healthy
-
-  envoy:
-    # A reverse proxy configured for no SSL on localhost. It fronts the requests
-    # for the static content and the websocket proxy.
-    extends:
-      file: docker-compose-common.yml
-      service: envoy
-    depends_on:
-      server:
-        condition: service_healthy
-      grpc-proxy:
-        condition: service_started
-      web:
-        condition: service_started

docker/README.md

@@ -2,16 +2,16 @@
 
 ## docker-server-slim
 
-The `docker-server-slim` project produces the image `deephaven/server-slim:local-build`.
+The `docker-server-slim` project produces the image `deephaven/server-slim-netty:local-build`.
 
 ## docker-server
 
 The `docker-server` project produces the images:
-* `deephaven/server:local-build`
-* `deephaven/server-nltk:local-build`
-* `deephaven/server-pytorch:local-build`
-* `deephaven/server-sklearn:local-build`
-* `deephaven/server-tensorflow:local-build`
+* `deephaven/server-netty:local-build`
+* `deephaven/server-nltk-netty:local-build`
+* `deephaven/server-pytorch-netty:local-build`
+* `deephaven/server-sklearn-netty:local-build`
+* `deephaven/server-tensorflow-netty:local-build`
 
 When the base images for `docker-server` are updated, the requirements.txt files may need to be updated.
 This can currently be done manually via: