From b7b57ee5175c3a367b68a81aa455a151b0124785 Mon Sep 17 00:00:00 2001 From: JJ Brosnan <84038776+jjbrosnan@users.noreply.github.com> Date: Thu, 19 Oct 2023 14:41:42 -0400 Subject: [PATCH 1/4] Groovy container w/ redpanda and examples. Also README. --- containers/groovy-examples-redpanda/README.md | 24 +++++++++ .../docker-compose.yml | 49 +++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 containers/groovy-examples-redpanda/README.md create mode 100644 containers/groovy-examples-redpanda/docker-compose.yml diff --git a/containers/groovy-examples-redpanda/README.md b/containers/groovy-examples-redpanda/README.md new file mode 100644 index 00000000000..3e0271c64ad --- /dev/null +++ b/containers/groovy-examples-redpanda/README.md @@ -0,0 +1,24 @@ +# Overview + +A Docker Compose deployment for [Deephaven](https://deephaven.io). + +## Features + +- [Deephaven](https://deephaven.io) +- [Groovy](https://groovy-lang.org/) scripting +- [Deephaven Examples](https://github.com/deephaven/examples) +- [Redpanda](https://vectorized.io/), a Kakfa-compatible event streaming platform. + +## Launch Deephaven + +For instructions on launching and using Kafka, see [Kafka in Deephaven: an introduction](https://deephaven.io/core/docs/conceptual/kafka-in-deephaven/) and [Simple Kafka import](https://deephaven.io/core/docs/how-to-guides/kafka-simple/). For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart). + +To launch Deephaven, execute the following in your deployment directory: + +```bash +compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy-examples-redpanda/docker-compose.yml +curl -O "${compose_file}" + +docker-compose pull +docker-compose up -d +``` diff --git a/containers/groovy-examples-redpanda/docker-compose.yml b/containers/groovy-examples-redpanda/docker-compose.yml new file mode 100644 index 00000000000..e06a826b4a1 --- /dev/null +++ b/containers/groovy-examples-redpanda/docker-compose.yml @@ -0,0 +1,49 @@ +version: "3.4" + +services: + deephaven: + image: ghcr.io/deephaven/server-slim:${VERSION:-latest} + ports: + - "${DEEPHAVEN_PORT:-10000}:10000" + volumes: + - ./data:/data + environment: + - START_OPTS=-Xmx4g + + examples: + image: ghcr.io/deephaven/examples + volumes: + - ./data:/data + command: initialize + + redpanda: + command: + - redpanda + - start + - --smp + - '1' + - --reserve-memory + - 0M + - --overprovisioned + - --node-id + - '0' + - --kafka-addr + - PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 + - --advertise-kafka-addr + - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 + image: docker.redpanda.com/vectorized/redpanda:v22.2.2 + ports: + - 9092:9092 + - 29092:29092 + + registry: + image: apicurio/apicurio-registry-mem:1.2.2.Final + expose: + - 8080 + ports: + - "8081:8080" + environment: + QUARKUS_PROFILE: prod + KAFKA_BOOTSTRAP_SERVERS: redpanda:9092 + APPLICATION_ID: registry_id + APPLICATION_SERVER: localhost:9000 From 2caf1e76099fc4eaa0ed32b439646a4e4006177a Mon Sep 17 00:00:00 2001 From: JJ Brosnan <84038776+jjbrosnan@users.noreply.github.com> Date: Thu, 9 Nov 2023 11:06:39 -0500 Subject: [PATCH 2/4] Updates from Devin's review - remove apicurio from docker-compose files and change docker-compose to docker compose in shell commands --- containers/groovy-examples-redpanda/README.md | 6 ++-- .../docker-compose.yml | 13 +------- containers/groovy-examples/README.md | 4 +-- containers/groovy-redpanda/README.md | 21 +++++++++++++ containers/groovy-redpanda/docker-compose.yml | 31 +++++++++++++++++++ containers/groovy/README.md | 6 ++-- containers/python-examples-redpanda/README.md | 8 ++--- .../docker-compose.yml | 12 ------- containers/python-examples/All-AI/README.md | 29 ----------------- .../python-examples/All-AI/docker-compose.yml | 17 ---------- containers/python-examples/NLTK/README.md | 4 +-- containers/python-examples/PyTorch/README.md | 4 +-- .../python-examples/SciKit-Learn/README.md | 4 +-- .../python-examples/TensorFlow/README.md | 4 +-- containers/python-examples/base/README.md | 4 +-- containers/python-redpanda/README.md | 23 ++++++++++++++ containers/python-redpanda/docker-compose.yml | 31 +++++++++++++++++++ containers/python/All-AI/README.md | 28 ----------------- containers/python/All-AI/docker-compose.yml | 11 ------- containers/python/NLTK/README.md | 4 +-- containers/python/PyTorch/README.md | 4 +-- containers/python/SciKit-Learn/README.md | 4 +-- containers/python/TensorFlow/README.md | 4 +-- containers/python/base/README.md | 4 +-- 24 files changed, 139 insertions(+), 141 deletions(-) create mode 100644 containers/groovy-redpanda/README.md create mode 100644 containers/groovy-redpanda/docker-compose.yml delete mode 100644 containers/python-examples/All-AI/README.md delete mode 100644 containers/python-examples/All-AI/docker-compose.yml create mode 100644 containers/python-redpanda/README.md create mode 100644 containers/python-redpanda/docker-compose.yml delete mode 100644 containers/python/All-AI/README.md delete mode 100644 containers/python/All-AI/docker-compose.yml diff --git a/containers/groovy-examples-redpanda/README.md b/containers/groovy-examples-redpanda/README.md index 3e0271c64ad..9977bc51cd0 100644 --- a/containers/groovy-examples-redpanda/README.md +++ b/containers/groovy-examples-redpanda/README.md @@ -11,7 +11,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io). ## Launch Deephaven -For instructions on launching and using Kafka, see [Kafka in Deephaven: an introduction](https://deephaven.io/core/docs/conceptual/kafka-in-deephaven/) and [Simple Kafka import](https://deephaven.io/core/docs/how-to-guides/kafka-simple/). For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart). +For instructions on launching and using Kafka in Deephaven, see[How to connect to a Kafka stream](https://deephaven.io/core/groovy/docs/how-to-guides/data-import-export/kafka-stream/). For instructions on getting started with Deephaven, see the [Quickstart](https://deephaven.io/core/groovy/docs/tutorials/quickstart). To launch Deephaven, execute the following in your deployment directory: @@ -19,6 +19,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy-examples-redpanda/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/groovy-examples-redpanda/docker-compose.yml b/containers/groovy-examples-redpanda/docker-compose.yml index e06a826b4a1..b160c313551 100644 --- a/containers/groovy-examples-redpanda/docker-compose.yml +++ b/containers/groovy-examples-redpanda/docker-compose.yml @@ -35,15 +35,4 @@ services: ports: - 9092:9092 - 29092:29092 - - registry: - image: apicurio/apicurio-registry-mem:1.2.2.Final - expose: - - 8080 - ports: - - "8081:8080" - environment: - QUARKUS_PROFILE: prod - KAFKA_BOOTSTRAP_SERVERS: redpanda:9092 - APPLICATION_ID: registry_id - APPLICATION_SERVER: localhost:9000 + \ No newline at end of file diff --git a/containers/groovy-examples/README.md b/containers/groovy-examples/README.md index d28e959ec48..bb252446dee 100644 --- a/containers/groovy-examples/README.md +++ b/containers/groovy-examples/README.md @@ -18,6 +18,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy-examples/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/groovy-redpanda/README.md b/containers/groovy-redpanda/README.md new file mode 100644 index 00000000000..b68c1fb5e97 --- /dev/null +++ b/containers/groovy-redpanda/README.md @@ -0,0 +1,21 @@ +# Overview + +## Features + +- [Deephaven](https://deephaven.io) +- [Groovy](https://groovy-lang.org/) scripting +- [Redpanda](https://vectorized.io/), a Kafka-compatible event streaming platform + +## Launch Deephaven + +For instructions on launching and using Kafka in Deephaven, see[How to connect to a Kafka stream](https://deephaven.io/core/groovy/docs/how-to-guides/data-import-export/kafka-stream/). For instructions on getting started with Deephaven, see the [Quickstart](https://deephaven.io/core/groovy/docs/tutorials/quickstart). + +To launch Deephaven, execute the following in your deployment directory: + +```sh +compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy-redpanda/docker-compose.yml +curl -O "${compose_file}" + +docker compose pull +docker compose up -d +``` diff --git a/containers/groovy-redpanda/docker-compose.yml b/containers/groovy-redpanda/docker-compose.yml new file mode 100644 index 00000000000..90588189d12 --- /dev/null +++ b/containers/groovy-redpanda/docker-compose.yml @@ -0,0 +1,31 @@ +version: "3.4" + +services: + deephaven: + image: ghcr.io/deephaven/server-slim:${VERSION:-latest} + ports: + - "${DEEPHAVEN_PORT:-10000}:10000" + volumes: + - ./data:/data + environment: + - START_OPTS=-Xmx4g + + redpanda: + command: + - redpanda + - start + - --smp + - '1' + - --reserve-memory + - 0M + - --overprovisioned + - --node-id + - '0' + - --kafka-addr + - PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 + - --advertise-kafka-addr + - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 + image: docker.redpanda.com/vectorized/redpanda:v22.2.2 + ports: + - 9092:9092 + - 29092:29092 diff --git a/containers/groovy/README.md b/containers/groovy/README.md index 61e4a8a0581..20fde7a89eb 100644 --- a/containers/groovy/README.md +++ b/containers/groovy/README.md @@ -10,7 +10,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io). ## Launch Deephaven -For launch instructions, see the [README](https://github.com/deephaven/deephaven-core/#launch-groovy--java). For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart). +For launch instructions, see the [README](https://github.com/deephaven/deephaven-core/#launch-groovy--java). For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/groovy/docs/tutorials/quickstart). To launch Deephaven, execute the following in your deployment directory: @@ -18,6 +18,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/python-examples-redpanda/README.md b/containers/python-examples-redpanda/README.md index 06f41af2e5c..b9ff13b1ca2 100644 --- a/containers/python-examples-redpanda/README.md +++ b/containers/python-examples-redpanda/README.md @@ -7,11 +7,11 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io). - [Deephaven](https://deephaven.io) - [Python](https://python.org/) scripting - [Deephaven Examples](https://github.com/deephaven/examples) -- [Redpanda](https://vectorized.io/), a Kakfa-compatible event streaming platform. +- [Redpanda](https://vectorized.io/), a Kakfa-compatible event streaming platform ## Launch Deephaven -For instructions on launching and using Kafka, see [Kafka in Deephaven: an introduction](https://deephaven.io/core/docs/conceptual/kafka-in-deephaven/) and [Simple Kafka import](https://deephaven.io/core/docs/how-to-guides/kafka-simple/). For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart). +For instructions on launching and using Kafka in Deephaven, see[How to connect to a Kafka stream](https://deephaven.io/core/groovy/docs/how-to-guides/data-import-export/kafka-stream/). For instructions on getting started with Deephaven, see the [Quickstart](https://deephaven.io/core/docs/tutorials/quickstart). To launch Deephaven, execute the following in your deployment directory: @@ -19,6 +19,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples-redpanda/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/python-examples-redpanda/docker-compose.yml b/containers/python-examples-redpanda/docker-compose.yml index 6bb3d79a8c4..845d4d9de7d 100644 --- a/containers/python-examples-redpanda/docker-compose.yml +++ b/containers/python-examples-redpanda/docker-compose.yml @@ -35,15 +35,3 @@ services: ports: - 9092:9092 - 29092:29092 - - registry: - image: apicurio/apicurio-registry-mem:1.2.2.Final - expose: - - 8080 - ports: - - "8081:8080" - environment: - QUARKUS_PROFILE: prod - KAFKA_BOOTSTRAP_SERVERS: redpanda:9092 - APPLICATION_ID: registry_id - APPLICATION_SERVER: localhost:9000 diff --git a/containers/python-examples/All-AI/README.md b/containers/python-examples/All-AI/README.md deleted file mode 100644 index 9226185282f..00000000000 --- a/containers/python-examples/All-AI/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# Overview - -A Docker Compose deployment for [Deephaven](https://deephaven.io). - -Contains all the python-based AI libraries together in one environment. - -## Features - -- [Deephaven](https://deephaven.io) -- [Python](https://python.org/) scripting -- [PyTorch](https://pytorch.org/) -- [TensorFlow](https://www.tensorflow.org/) -- [NLTK](https://www.nltk.org/) -- [SciKit-Learn](https://scikit-learn.org/stable/) -- [Deephaven Examples](https://github.com/deephaven/examples) - -## Launch Deephaven - -For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data). For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart). - -To launch Deephaven, execute the following in your deployment directory: - -```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/All-AI/docker-compose.yml -curl -O "${compose_file}" - -docker-compose pull -docker-compose up -d -``` diff --git a/containers/python-examples/All-AI/docker-compose.yml b/containers/python-examples/All-AI/docker-compose.yml deleted file mode 100644 index 69401b7c849..00000000000 --- a/containers/python-examples/All-AI/docker-compose.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: "3.4" - -services: - deephaven: - image: ghcr.io/deephaven/server-all-ai:${VERSION:-latest} - ports: - - "${DEEPHAVEN_PORT:-10000}:10000" - volumes: - - ./data:/data - environment: - - START_OPTS=-Xmx4g - - examples: - image: ghcr.io/deephaven/examples:${VERSION:-latest} - volumes: - - ./data:/data - command: initialize diff --git a/containers/python-examples/NLTK/README.md b/containers/python-examples/NLTK/README.md index ddaedb2f0f6..48457bf3b31 100644 --- a/containers/python-examples/NLTK/README.md +++ b/containers/python-examples/NLTK/README.md @@ -19,6 +19,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/NLTK/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/python-examples/PyTorch/README.md b/containers/python-examples/PyTorch/README.md index 079bd1610a0..bc665cca13b 100644 --- a/containers/python-examples/PyTorch/README.md +++ b/containers/python-examples/PyTorch/README.md @@ -19,6 +19,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/PyTorch/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/python-examples/SciKit-Learn/README.md b/containers/python-examples/SciKit-Learn/README.md index 6b743ee3370..84d3c80985d 100644 --- a/containers/python-examples/SciKit-Learn/README.md +++ b/containers/python-examples/SciKit-Learn/README.md @@ -19,6 +19,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/SciKit-Learn/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/python-examples/TensorFlow/README.md b/containers/python-examples/TensorFlow/README.md index 41e2a0c1c53..e29a1b88563 100644 --- a/containers/python-examples/TensorFlow/README.md +++ b/containers/python-examples/TensorFlow/README.md @@ -19,6 +19,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/TensorFlow/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/python-examples/base/README.md b/containers/python-examples/base/README.md index 37e4616e306..42a48ffcc05 100644 --- a/containers/python-examples/base/README.md +++ b/containers/python-examples/base/README.md @@ -18,6 +18,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/base/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/python-redpanda/README.md b/containers/python-redpanda/README.md new file mode 100644 index 00000000000..9ee35655a46 --- /dev/null +++ b/containers/python-redpanda/README.md @@ -0,0 +1,23 @@ +# Overview + +A Docker Compose deployment for [Deephaven](https://deephaven.io). + +## Features + +- [Deephaven](https://deephaven.io) +- [Python](https://python.org) scripting +- [Redpanda](https://vectorized.io/), a Kafka-compatible event streaming platform + +## Launch Deephaven + +For instructions on launching and using Kafka, see [How to connect to a Kafka stream](https://deephaven.io/core/docs/how-to-guides/data-import-export/kafka-stream/). For instructions on getting started with Deephaven, see the [Quickstart](https://deephaven.io/core/docs/tutorials/quickstart). + +To launch Deephaven, execute the following in your deployment directory: + +```sh +compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-redpanda/docker-compose.yml +curl -O "${compose_file}" + +docker compose pull +docker compose up -d +``` diff --git a/containers/python-redpanda/docker-compose.yml b/containers/python-redpanda/docker-compose.yml new file mode 100644 index 00000000000..c1387d735d9 --- /dev/null +++ b/containers/python-redpanda/docker-compose.yml @@ -0,0 +1,31 @@ +version: "3.4" + +services: + deephaven: + image: ghcr.io/deephaven/server:${VERSION:-latest} + ports: + - "${DEEPHAVEN_PORT:-10000}:10000" + volumes: + - ./data:/data + environment: + - START_OPTS=-Xmx4g + + redpanda: + command: + - redpanda + - start + - --smp + - '1' + - --reserve-memory + - 0M + - --overprovisioned + - --node-id + - '0' + - --kafka-addr + - PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 + - --advertise-kafka-addr + - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 + image: docker.redpanda.com/vectorized/redpanda:v22.2.2 + ports: + - 9092:9092 + - 29092:29092 diff --git a/containers/python/All-AI/README.md b/containers/python/All-AI/README.md deleted file mode 100644 index cf175c740c4..00000000000 --- a/containers/python/All-AI/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# Overview - -A Docker Compose deployment for [Deephaven](https://deephaven.io). - -Contains all the python-based AI libraries together in one environment. - -## Features - -- [Deephaven](https://deephaven.io) -- [Python](https://python.org/) scripting -- [PyTorch](https://pytorch.org/) -- [TensorFlow](https://www.tensorflow.org/) -- [NLTK](https://www.nltk.org/) -- [SciKit-Learn](https://scikit-learn.org/stable/) - -## Launch Deephaven - -For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data). For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart). - -To launch Deephaven, execute the following in your deployment directory: - -```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/All-AI/docker-compose.yml -curl -O "${compose_file}" - -docker-compose pull -docker-compose up -d -``` diff --git a/containers/python/All-AI/docker-compose.yml b/containers/python/All-AI/docker-compose.yml deleted file mode 100644 index f2cd6522fbb..00000000000 --- a/containers/python/All-AI/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: "3.4" - -services: - deephaven: - image: ghcr.io/deephaven/server-all-ai:${VERSION:-latest} - ports: - - "${DEEPHAVEN_PORT:-10000}:10000" - volumes: - - ./data:/data - environment: - - START_OPTS=-Xmx4g diff --git a/containers/python/NLTK/README.md b/containers/python/NLTK/README.md index 3ebe51dc894..cf147d0a5cf 100644 --- a/containers/python/NLTK/README.md +++ b/containers/python/NLTK/README.md @@ -18,6 +18,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/NLTK/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/python/PyTorch/README.md b/containers/python/PyTorch/README.md index 0822c21dd54..79ef78ad1f6 100644 --- a/containers/python/PyTorch/README.md +++ b/containers/python/PyTorch/README.md @@ -18,6 +18,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/PyTorch/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/python/SciKit-Learn/README.md b/containers/python/SciKit-Learn/README.md index 6ecc68230b8..7deb6529878 100644 --- a/containers/python/SciKit-Learn/README.md +++ b/containers/python/SciKit-Learn/README.md @@ -18,6 +18,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/SciKit-Learn/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/python/TensorFlow/README.md b/containers/python/TensorFlow/README.md index 01f421a3dea..524e567c279 100644 --- a/containers/python/TensorFlow/README.md +++ b/containers/python/TensorFlow/README.md @@ -18,6 +18,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/TensorFlow/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` diff --git a/containers/python/base/README.md b/containers/python/base/README.md index 5e90f35377a..7828746fafd 100644 --- a/containers/python/base/README.md +++ b/containers/python/base/README.md @@ -17,6 +17,6 @@ To launch Deephaven, execute the following in your deployment directory: compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/base/docker-compose.yml curl -O "${compose_file}" -docker-compose pull -docker-compose up -d +docker compose pull +docker compose up -d ``` From b1b7e2a7bbf6d8b174ccbc33ac519d3646e81b7c Mon Sep 17 00:00:00 2001 From: JJ Brosnan <84038776+jjbrosnan@users.noreply.github.com> Date: Tue, 12 Dec 2023 15:43:27 -0500 Subject: [PATCH 3/4] Updates from Devin's review --- containers/groovy-examples-redpanda/README.md | 4 +--- .../groovy-examples-redpanda/docker-compose.yml | 17 ++++++----------- containers/groovy-examples/README.md | 4 +--- containers/groovy-redpanda/README.md | 4 +--- containers/groovy-redpanda/docker-compose.yml | 17 ++++++----------- containers/groovy/README.md | 4 +--- containers/python-examples-redpanda/README.md | 4 +--- .../python-examples-redpanda/docker-compose.yml | 17 ++++++----------- containers/python-examples/NLTK/README.md | 4 +--- containers/python-examples/PyTorch/README.md | 4 +--- .../python-examples/SciKit-Learn/README.md | 4 +--- containers/python-examples/TensorFlow/README.md | 4 +--- containers/python-examples/base/README.md | 4 +--- containers/python-redpanda/README.md | 4 +--- containers/python-redpanda/docker-compose.yml | 17 ++++++----------- containers/python/NLTK/README.md | 4 +--- containers/python/PyTorch/README.md | 4 +--- containers/python/SciKit-Learn/README.md | 4 +--- containers/python/TensorFlow/README.md | 4 +--- containers/python/base/README.md | 4 +--- 20 files changed, 40 insertions(+), 92 deletions(-) diff --git a/containers/groovy-examples-redpanda/README.md b/containers/groovy-examples-redpanda/README.md index 9977bc51cd0..b8abde56d1e 100644 --- a/containers/groovy-examples-redpanda/README.md +++ b/containers/groovy-examples-redpanda/README.md @@ -16,9 +16,7 @@ For instructions on launching and using Kafka in Deephaven, see[How to connect t To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy-examples-redpanda/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy-examples-redpanda/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/groovy-examples-redpanda/docker-compose.yml b/containers/groovy-examples-redpanda/docker-compose.yml index b160c313551..b4b2ef0b83b 100644 --- a/containers/groovy-examples-redpanda/docker-compose.yml +++ b/containers/groovy-examples-redpanda/docker-compose.yml @@ -20,18 +20,13 @@ services: command: - redpanda - start - - --smp - - '1' - - --reserve-memory - - 0M + - --kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 + - --advertise-kafka-addr PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 + - --smp 1 + - --reserve-memory 0M - --overprovisioned - - --node-id - - '0' - - --kafka-addr - - PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 - - --advertise-kafka-addr - - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 - image: docker.redpanda.com/vectorized/redpanda:v22.2.2 + - --node-id 0 + image: docker.redpanda.com/redpandadata/redpanda:v23.2.18 ports: - 9092:9092 - 29092:29092 diff --git a/containers/groovy-examples/README.md b/containers/groovy-examples/README.md index bb252446dee..2d295145a99 100644 --- a/containers/groovy-examples/README.md +++ b/containers/groovy-examples/README.md @@ -15,9 +15,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy-examples/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy-examples/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/groovy-redpanda/README.md b/containers/groovy-redpanda/README.md index b68c1fb5e97..8fe9215a8ec 100644 --- a/containers/groovy-redpanda/README.md +++ b/containers/groovy-redpanda/README.md @@ -13,9 +13,7 @@ For instructions on launching and using Kafka in Deephaven, see[How to connect t To launch Deephaven, execute the following in your deployment directory: ```sh -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy-redpanda/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy-redpanda/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/groovy-redpanda/docker-compose.yml b/containers/groovy-redpanda/docker-compose.yml index 90588189d12..b9d71595d9e 100644 --- a/containers/groovy-redpanda/docker-compose.yml +++ b/containers/groovy-redpanda/docker-compose.yml @@ -14,18 +14,13 @@ services: command: - redpanda - start - - --smp - - '1' - - --reserve-memory - - 0M + - --kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 + - --advertise-kafka-addr PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 + - --smp 1 + - --reserve-memory 0M - --overprovisioned - - --node-id - - '0' - - --kafka-addr - - PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 - - --advertise-kafka-addr - - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 - image: docker.redpanda.com/vectorized/redpanda:v22.2.2 + - --node-id 0 + image: docker.redpanda.com/redpandadata/redpanda:v23.2.18 ports: - 9092:9092 - 29092:29092 diff --git a/containers/groovy/README.md b/containers/groovy/README.md index 20fde7a89eb..eacfa216d55 100644 --- a/containers/groovy/README.md +++ b/containers/groovy/README.md @@ -15,9 +15,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/groovy/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python-examples-redpanda/README.md b/containers/python-examples-redpanda/README.md index b9ff13b1ca2..1082408865f 100644 --- a/containers/python-examples-redpanda/README.md +++ b/containers/python-examples-redpanda/README.md @@ -16,9 +16,7 @@ For instructions on launching and using Kafka in Deephaven, see[How to connect t To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples-redpanda/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples-redpanda/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python-examples-redpanda/docker-compose.yml b/containers/python-examples-redpanda/docker-compose.yml index 845d4d9de7d..5ecf425a275 100644 --- a/containers/python-examples-redpanda/docker-compose.yml +++ b/containers/python-examples-redpanda/docker-compose.yml @@ -20,18 +20,13 @@ services: command: - redpanda - start - - --smp - - '1' - - --reserve-memory - - 0M + - --kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 + - --advertise-kafka-addr PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 + - --smp 1 + - --reserve-memory 0M - --overprovisioned - - --node-id - - '0' - - --kafka-addr - - PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 - - --advertise-kafka-addr - - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 - image: docker.redpanda.com/vectorized/redpanda:v22.2.2 + - --node-id 0 + image: docker.redpanda.com/redpandadata/redpanda:v23.2.18 ports: - 9092:9092 - 29092:29092 diff --git a/containers/python-examples/NLTK/README.md b/containers/python-examples/NLTK/README.md index 48457bf3b31..9c84a31c5a6 100644 --- a/containers/python-examples/NLTK/README.md +++ b/containers/python-examples/NLTK/README.md @@ -16,9 +16,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/NLTK/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/NLTK/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python-examples/PyTorch/README.md b/containers/python-examples/PyTorch/README.md index bc665cca13b..c2cae1968ce 100644 --- a/containers/python-examples/PyTorch/README.md +++ b/containers/python-examples/PyTorch/README.md @@ -16,9 +16,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/PyTorch/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/PyTorch/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python-examples/SciKit-Learn/README.md b/containers/python-examples/SciKit-Learn/README.md index 84d3c80985d..bc8d5253fed 100644 --- a/containers/python-examples/SciKit-Learn/README.md +++ b/containers/python-examples/SciKit-Learn/README.md @@ -16,9 +16,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/SciKit-Learn/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/SciKit-Learn/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python-examples/TensorFlow/README.md b/containers/python-examples/TensorFlow/README.md index e29a1b88563..e31fdbdb0f8 100644 --- a/containers/python-examples/TensorFlow/README.md +++ b/containers/python-examples/TensorFlow/README.md @@ -16,9 +16,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/TensorFlow/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/TensorFlow/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python-examples/base/README.md b/containers/python-examples/base/README.md index 42a48ffcc05..efbe018a81f 100644 --- a/containers/python-examples/base/README.md +++ b/containers/python-examples/base/README.md @@ -15,9 +15,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/base/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-examples/base/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python-redpanda/README.md b/containers/python-redpanda/README.md index 9ee35655a46..5e7645bb74b 100644 --- a/containers/python-redpanda/README.md +++ b/containers/python-redpanda/README.md @@ -15,9 +15,7 @@ For instructions on launching and using Kafka, see [How to connect to a Kafka st To launch Deephaven, execute the following in your deployment directory: ```sh -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-redpanda/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python-redpanda/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python-redpanda/docker-compose.yml b/containers/python-redpanda/docker-compose.yml index c1387d735d9..929da7b3f60 100644 --- a/containers/python-redpanda/docker-compose.yml +++ b/containers/python-redpanda/docker-compose.yml @@ -14,18 +14,13 @@ services: command: - redpanda - start - - --smp - - '1' - - --reserve-memory - - 0M + - --kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 + - --advertise-kafka-addr PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 + - --smp 1 + - --reserve-memory 0M - --overprovisioned - - --node-id - - '0' - - --kafka-addr - - PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 - - --advertise-kafka-addr - - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 - image: docker.redpanda.com/vectorized/redpanda:v22.2.2 + - --node-id 0 + image: docker.redpanda.com/redpandadata/redpanda:v23.2.18 ports: - 9092:9092 - 29092:29092 diff --git a/containers/python/NLTK/README.md b/containers/python/NLTK/README.md index cf147d0a5cf..54e608603ef 100644 --- a/containers/python/NLTK/README.md +++ b/containers/python/NLTK/README.md @@ -15,9 +15,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/NLTK/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/NLTK/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python/PyTorch/README.md b/containers/python/PyTorch/README.md index 79ef78ad1f6..3e276f39965 100644 --- a/containers/python/PyTorch/README.md +++ b/containers/python/PyTorch/README.md @@ -15,9 +15,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/PyTorch/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/PyTorch/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python/SciKit-Learn/README.md b/containers/python/SciKit-Learn/README.md index 7deb6529878..9ddecaec399 100644 --- a/containers/python/SciKit-Learn/README.md +++ b/containers/python/SciKit-Learn/README.md @@ -15,9 +15,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/SciKit-Learn/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/SciKit-Learn/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python/TensorFlow/README.md b/containers/python/TensorFlow/README.md index 524e567c279..b208b794515 100644 --- a/containers/python/TensorFlow/README.md +++ b/containers/python/TensorFlow/README.md @@ -15,9 +15,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/TensorFlow/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/TensorFlow/docker-compose.yml docker compose pull docker compose up -d ``` diff --git a/containers/python/base/README.md b/containers/python/base/README.md index 7828746fafd..c5e62a0a70a 100644 --- a/containers/python/base/README.md +++ b/containers/python/base/README.md @@ -14,9 +14,7 @@ For launch instructions, see the [README](https://github.com/deephaven/deephaven To launch Deephaven, execute the following in your deployment directory: ```bash -compose_file=https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/base/docker-compose.yml -curl -O "${compose_file}" - +curl -O https://raw.githubusercontent.com/deephaven/deephaven-core/main/containers/python/base/docker-compose.yml docker compose pull docker compose up -d ``` From aa459a94bd89fb4df4bfb451e1f53059d8f1cd4a Mon Sep 17 00:00:00 2001 From: JJ Brosnan <84038776+jjbrosnan@users.noreply.github.com> Date: Fri, 22 Dec 2023 08:31:04 -0500 Subject: [PATCH 4/4] Make consistent with Redpanda --- .../groovy-examples-redpanda/docker-compose.yml | 15 ++++++++------- containers/groovy-redpanda/docker-compose.yml | 14 ++++++++------ .../python-examples-redpanda/docker-compose.yml | 14 ++++++++------ containers/python-redpanda/docker-compose.yml | 14 ++++++++------ 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/containers/groovy-examples-redpanda/docker-compose.yml b/containers/groovy-examples-redpanda/docker-compose.yml index b4b2ef0b83b..bc0a0484bc7 100644 --- a/containers/groovy-examples-redpanda/docker-compose.yml +++ b/containers/groovy-examples-redpanda/docker-compose.yml @@ -20,14 +20,15 @@ services: command: - redpanda - start - - --kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 - - --advertise-kafka-addr PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 + - --kafka-addr internal://0.0.0.0:9092,external://0.0.0.0:19092 + - --advertise-kafka-addr internal://redpanda:9092,external://localhost:19092 + - --schema-registry-addr internal://0.0.0.0:8081,external://0.0.0.0:18081 - --smp 1 - - --reserve-memory 0M - - --overprovisioned - - --node-id 0 + - --memory 1G + - --mode dev-container image: docker.redpanda.com/redpandadata/redpanda:v23.2.18 ports: + - 8081:8081 + - 18081:18081 - 9092:9092 - - 29092:29092 - \ No newline at end of file + - 19092:19092 diff --git a/containers/groovy-redpanda/docker-compose.yml b/containers/groovy-redpanda/docker-compose.yml index b9d71595d9e..1cb7594a8ff 100644 --- a/containers/groovy-redpanda/docker-compose.yml +++ b/containers/groovy-redpanda/docker-compose.yml @@ -14,13 +14,15 @@ services: command: - redpanda - start - - --kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 - - --advertise-kafka-addr PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 + - --kafka-addr internal://0.0.0.0:9092,external://0.0.0.0:19092 + - --advertise-kafka-addr internal://redpanda:9092,external://localhost:19092 + - --schema-registry-addr internal://0.0.0.0:8081,external://0.0.0.0:18081 - --smp 1 - - --reserve-memory 0M - - --overprovisioned - - --node-id 0 + - --memory 1G + - --mode dev-container image: docker.redpanda.com/redpandadata/redpanda:v23.2.18 ports: + - 8081:8081 + - 18081:18081 - 9092:9092 - - 29092:29092 + - 19092:19092 diff --git a/containers/python-examples-redpanda/docker-compose.yml b/containers/python-examples-redpanda/docker-compose.yml index 5ecf425a275..218494e5293 100644 --- a/containers/python-examples-redpanda/docker-compose.yml +++ b/containers/python-examples-redpanda/docker-compose.yml @@ -20,13 +20,15 @@ services: command: - redpanda - start - - --kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 - - --advertise-kafka-addr PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 + - --kafka-addr internal://0.0.0.0:9092,external://0.0.0.0:19092 + - --advertise-kafka-addr internal://redpanda:9092,external://localhost:19092 + - --schema-registry-addr internal://0.0.0.0:8081,external://0.0.0.0:18081 - --smp 1 - - --reserve-memory 0M - - --overprovisioned - - --node-id 0 + - --memory 1G + - --mode dev-container image: docker.redpanda.com/redpandadata/redpanda:v23.2.18 ports: + - 8081:8081 + - 18081:18081 - 9092:9092 - - 29092:29092 + - 19092:19092 diff --git a/containers/python-redpanda/docker-compose.yml b/containers/python-redpanda/docker-compose.yml index 929da7b3f60..acbccaa7560 100644 --- a/containers/python-redpanda/docker-compose.yml +++ b/containers/python-redpanda/docker-compose.yml @@ -14,13 +14,15 @@ services: command: - redpanda - start - - --kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 - - --advertise-kafka-addr PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092 + - --kafka-addr internal://0.0.0.0:9092,external://0.0.0.0:19092 + - --advertise-kafka-addr internal://redpanda:9092,external://localhost:19092 + - --schema-registry-addr internal://0.0.0.0:8081,external://0.0.0.0:18081 - --smp 1 - - --reserve-memory 0M - - --overprovisioned - - --node-id 0 + - --memory 1G + - --mode dev-container image: docker.redpanda.com/redpandadata/redpanda:v23.2.18 ports: + - 8081:8081 + - 18081:18081 - 9092:9092 - - 29092:29092 + - 19092:19092