From 9034a48f17cc9525ae2fb6af14002d4dd3f5b97d Mon Sep 17 00:00:00 2001 From: JJ Brosnan <84038776+jjbrosnan@users.noreply.github.com> Date: Wed, 12 Oct 2022 13:28:45 -0400 Subject: [PATCH] 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 --- containers/groovy-examples/docker-compose.yml | 44 +++---------------- containers/groovy/docker-compose.yml | 42 +++--------------- .../docker-compose.yml | 43 +++--------------- .../python-examples/All-AI/docker-compose.yml | 41 ++--------------- .../python-examples/NLTK/docker-compose.yml | 41 +++-------------- .../PyTorch/docker-compose.yml | 40 ++--------------- .../SciKit-Learn/docker-compose.yml | 41 +++-------------- .../TensorFlow/docker-compose.yml | 40 ++--------------- .../python-examples/base/docker-compose.yml | 42 +++--------------- containers/python/All-AI/docker-compose.yml | 41 ++--------------- containers/python/NLTK/docker-compose.yml | 41 +++-------------- containers/python/PyTorch/docker-compose.yml | 40 ++--------------- .../python/SciKit-Learn/docker-compose.yml | 41 +++-------------- .../python/TensorFlow/docker-compose.yml | 40 ++--------------- containers/python/base/docker-compose.yml | 42 +++--------------- 15 files changed, 70 insertions(+), 549 deletions(-) diff --git a/containers/groovy-examples/docker-compose.yml b/containers/groovy-examples/docker-compose.yml index 8ac7e9e7a3a..24b781819d7 100644 --- 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 index 0e22898c9ca..4718dfdbfce 100644 --- 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 index 9585008d32d..c951b378d09 100644 --- a/containers/python-examples-redpanda/docker-compose.yml +++ b/containers/python-examples-redpanda/docker-compose.yml @@ -1,41 +1,14 @@ 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 @@ -43,7 +16,6 @@ services: - ./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 index 8ea30148574..d84367d3942 100644 --- 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 index 8cb69624db0..a75f7fcb68a 100644 --- 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 index c515d6215e5..f39ff15ac21 100644 --- 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 index ea292c53f2a..c4d5afa0359 100644 --- 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: diff --git a/containers/python-examples/TensorFlow/docker-compose.yml b/containers/python-examples/TensorFlow/docker-compose.yml index 23b4bc00d3e..9fefe698413 100644 --- a/containers/python-examples/TensorFlow/docker-compose.yml +++ b/containers/python-examples/TensorFlow/docker-compose.yml @@ -1,50 +1,18 @@ version: "3.4" services: - server: - image: ghcr.io/deephaven/server-tensorflow:${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-tensorflow: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/base/docker-compose.yml b/containers/python-examples/base/docker-compose.yml index ee1e969d323..97e0daa6dc8 100644 --- a/containers/python-examples/base/docker-compose.yml +++ b/containers/python-examples/base/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: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/All-AI/docker-compose.yml b/containers/python/All-AI/docker-compose.yml index 5a1fc96df25..bfc4e0971f0 100644 --- a/containers/python/All-AI/docker-compose.yml +++ b/containers/python/All-AI/docker-compose.yml @@ -1,44 +1,11 @@ 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" - -volumes: - web-tmp: - api-cache: + - JAVA_OPTS=-Xmx4g diff --git a/containers/python/NLTK/docker-compose.yml b/containers/python/NLTK/docker-compose.yml index 60877c52bec..5b545c500d9 100644 --- a/containers/python/NLTK/docker-compose.yml +++ b/containers/python/NLTK/docker-compose.yml @@ -1,42 +1,11 @@ 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" - -volumes: - web-tmp: - api-cache: + - JAVA_OPTS=-Xmx4g diff --git a/containers/python/PyTorch/docker-compose.yml b/containers/python/PyTorch/docker-compose.yml index e3cc3a28d99..4b78ceaba58 100644 --- a/containers/python/PyTorch/docker-compose.yml +++ b/containers/python/PyTorch/docker-compose.yml @@ -1,44 +1,12 @@ 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" - -volumes: - web-tmp: - api-cache: + - JAVA_OPTS=-Xmx4g diff --git a/containers/python/SciKit-Learn/docker-compose.yml b/containers/python/SciKit-Learn/docker-compose.yml index 3839500dcaf..d4b67fafbff 100644 --- a/containers/python/SciKit-Learn/docker-compose.yml +++ b/containers/python/SciKit-Learn/docker-compose.yml @@ -1,42 +1,11 @@ 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" - -volumes: - web-tmp: - api-cache: + - JAVA_OPTS=-Xmx4g diff --git a/containers/python/TensorFlow/docker-compose.yml b/containers/python/TensorFlow/docker-compose.yml index 83605868615..74c976cafc6 100644 --- a/containers/python/TensorFlow/docker-compose.yml +++ b/containers/python/TensorFlow/docker-compose.yml @@ -1,44 +1,12 @@ version: "3.4" services: - server: - image: ghcr.io/deephaven/server-tensorflow:${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-tensorflow: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" - -volumes: - web-tmp: - api-cache: + - JAVA_OPTS=-Xmx4g diff --git a/containers/python/base/docker-compose.yml b/containers/python/base/docker-compose.yml index b2c6f863699..67ebddd5311 100644 --- a/containers/python/base/docker-compose.yml +++ b/containers/python/base/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: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" - -volumes: - web-tmp: - api-cache: - + - JAVA_OPTS=-Xmx4g