Updates - remove references to old packages

deephaven · Jan 18, 2022 · 1d3c108 · 1d3c108
1 parent cfbeb6e
commit 1d3c108
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 54 deletions.
diff --git a/README.md b/README.md
@@ -22,13 +22,13 @@ which functions as the data backbone for prominent hedge funds, banks, and finan
 
 ## Supported Languages
 
-| Language      | Server Application | Client Application (OpenAPI) |
-| ------------- | ------------------ | ---------------------------- |
-| Python        | Yes                | Yes                          |
-| Java / Groovy | Yes                | Yes                          |
-| C++           | No                 | Yes                          |
-| JavaScript    | No                 | Yes                          |
-| gRPC          | -                  | Yes                          |
+| Language      | Server Application | Client Application |
+| ------------- | ------------------ | ------------------ |
+| Python        | Yes                | Yes                |
+| Java / Groovy | Yes                | Yes                |
+| C++           | No                 | Yes                |
+| JavaScript    | No                 | Yes                |
+| gRPC          | -                  | Yes                |
 
 ## Run Deephaven
 
@@ -118,6 +118,12 @@ docker-compose up -d
 
 Run the following commands to launch Deephaven for Python server applications with the [TensorFlow](https://www.tensorflow.org/) module pre-installed.
 
+```bash
+curl https://raw.githubusercontent.com/deephaven/deephaven-core/main/containeres/python/TensorFlow/docker-compose.yml -O
+docker-compose pull
+docker-compose up -d
+```
+
 ### Launch: Python with example data
 
 Run the following commands to launch Deephaven for Python server applications, with example data.

diff --git a/containers/python-examples/NLTK/docker-compose.yml b/containers/python-examples/NLTK/docker-compose.yml
@@ -22,9 +22,9 @@ services:
   grpc-proxy:
     image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest}
     environment:
-      - BACKEND_ADDR=grpc-api:8080
+      - BACKEND_ADDR=server:8080
     depends_on:
-      - grpc-api
+      - server
     expose:
       - '8080'
 
@@ -33,12 +33,12 @@ services:
     depends_on:
       - web
       - grpc-proxy
-      - grpc-api
+      - server
     ports:
       - "${PORT:-10000}:10000"
 
   examples:
-    image: ghcr.io/deephaven/examples
+    image: ghcr.io/deephaven/examples:latest
     volumes:
       - ./data:/data
     command: initialize

diff --git a/containers/python-examples/PyTorch/docker-compose.yml b/containers/python-examples/PyTorch/docker-compose.yml
@@ -22,9 +22,9 @@ services:
   grpc-proxy:
     image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest}
     environment:
-      - BACKEND_ADDR=grpc-api:8080
+      - BACKEND_ADDR=server:8080
     depends_on:
-      - grpc-api
+      - server
     expose:
       - '8080'
 
@@ -33,12 +33,12 @@ services:
     depends_on:
       - web
       - grpc-proxy
-      - grpc-api
+      - server
     ports:
       - "${PORT:-10000}:10000"
 
   examples:
-    image: ghcr.io/deephaven/examples
+    image: ghcr.io/deephaven/examples:latest
     volumes:
       - ./data:/data
     command: initialize

diff --git a/containers/python-examples/SciKit-Learn/docker-compose.yml b/containers/python-examples/SciKit-Learn/docker-compose.yml
@@ -22,9 +22,9 @@ services:
   grpc-proxy:
     image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest}
     environment:
-      - BACKEND_ADDR=grpc-api:8080
+      - BACKEND_ADDR=server:8080
     depends_on:
-      - grpc-api
+      - server
     expose:
       - '8080'
 
@@ -33,12 +33,12 @@ services:
     depends_on:
       - web
       - grpc-proxy
-      - grpc-api
+      - server
     ports:
       - "${PORT:-10000}:10000"
 
   examples:
-    image: ghcr.io/deephaven/examples
+    image: ghcr.io/deephaven/examples:latest
     volumes:
       - ./data:/data
     command: initialize

diff --git a/containers/python-examples/TensorFlow/docker-compose.yml b/containers/python-examples/TensorFlow/docker-compose.yml
@@ -22,9 +22,9 @@ services:
   grpc-proxy:
     image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest}
     environment:
-      - BACKEND_ADDR=grpc-api:8080
+      - BACKEND_ADDR=server:8080
     depends_on:
-      - grpc-api
+      - server
     expose:
       - '8080'
 
@@ -33,12 +33,12 @@ services:
     depends_on:
       - web
       - grpc-proxy
-      - grpc-api
+      - server
     ports:
       - "${PORT:-10000}:10000"
 
   examples:
-    image: ghcr.io/deephaven/examples
+    image: ghcr.io/deephaven/examples:latest
     volumes:
       - ./data:/data
     command: initialize

diff --git a/containers/python-examples/base/docker-compose.yml b/containers/python-examples/base/docker-compose.yml
@@ -1,8 +1,8 @@
 version: "3.4"
 
 services:
-  grpc-api:
-    image: ghcr.io/deephaven/grpc-api:${VERSION:-latest}
+  server:
+    image: ghcr.io/deephaven/server:${VERSION:-latest}
     expose:
       - '8080'
     volumes:
@@ -22,9 +22,9 @@ services:
   grpc-proxy:
     image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest}
     environment:
-      - BACKEND_ADDR=grpc-api:8080
+      - BACKEND_ADDR=server:8080
     depends_on:
-      - grpc-api
+      - server
     expose:
       - '8080'
 
@@ -33,12 +33,12 @@ services:
     depends_on:
       - web
       - grpc-proxy
-      - grpc-api
+      - server
     ports:
       - "${PORT:-10000}:10000"
 
   examples:
-    image: ghcr.io/deephaven/examples
+    image: ghcr.io/deephaven/examples:latest
     volumes:
       - ./data:/data
     command: initialize

diff --git a/containers/python/NLTK/docker-compose.yml b/containers/python/NLTK/docker-compose.yml
@@ -1,8 +1,8 @@
 version: "3.4"
 
 services:
-  grpc-api:
-    image: ghcr.io/deephaven/nltk-base:${VERSION:-latest}
+  server:
+    image: ghcr.io/deephaven/server-nltk:${VERSION:-latest}
     expose:
       - '8080'
     volumes:
@@ -22,9 +22,9 @@ services:
   grpc-proxy:
     image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest}
     environment:
-      - BACKEND_ADDR=grpc-api:8080
+      - BACKEND_ADDR=server:8080
     depends_on:
-      - grpc-api
+      - server
     expose:
       - '8080'
 
@@ -33,7 +33,7 @@ services:
     depends_on:
       - web
       - grpc-proxy
-      - grpc-api
+      - server
     ports:
       - "${PORT:-10000}:10000"
 

diff --git a/containers/python/PyTorch/docker-compose.yml b/containers/python/PyTorch/docker-compose.yml
@@ -1,8 +1,8 @@
 version: "3.4"
 
 services:
-  grpc-api:
-    image: ghcr.io/deephaven/pytorch-base:${VERSION:-latest}
+  server:
+    image: ghcr.io/deephaven/server-pytorch:${VERSION:-latest}
     expose:
       - '8080'
     volumes:
@@ -22,9 +22,9 @@ services:
   grpc-proxy:
     image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest}
     environment:
-      - BACKEND_ADDR=grpc-api:8080
+      - BACKEND_ADDR=server:8080
     depends_on:
-      - grpc-api
+      - server
     expose:
       - '8080'
 
@@ -33,7 +33,7 @@ services:
     depends_on:
       - web
       - grpc-proxy
-      - grpc-api
+      - server
     ports:
       - "${PORT:-10000}:10000"
 

diff --git a/containers/python/SciKit-Learn/docker-compose.yml b/containers/python/SciKit-Learn/docker-compose.yml
@@ -1,8 +1,8 @@
 version: "3.4"
 
 services:
-  grpc-api:
-    image: ghcr.io/deephaven/sklearn-base:${VERSION:-latest}
+  server:
+    image: ghcr.io/deephaven/server-sklearn:${VERSION:-latest}
     expose:
       - '8080'
     volumes:
@@ -22,9 +22,9 @@ services:
   grpc-proxy:
     image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest}
     environment:
-      - BACKEND_ADDR=grpc-api:8080
+      - BACKEND_ADDR=server:8080
     depends_on:
-      - grpc-api
+      - server
     expose:
       - '8080'
 
@@ -33,7 +33,7 @@ services:
     depends_on:
       - web
       - grpc-proxy
-      - grpc-api
+      - server 
     ports:
       - "${PORT:-10000}:10000"
 

diff --git a/containers/python/TensorFlow/docker-compose.yml b/containers/python/TensorFlow/docker-compose.yml
@@ -1,8 +1,8 @@
 version: "3.4"
 
 services:
-  grpc-api:
-    image: ghcr.io/deephaven/tensorflow-base:${VERSION:-latest}
+  server:
+    image: ghcr.io/deephaven/server-tensorflow:${VERSION:-latest}
     expose:
       - '8080'
     volumes:
@@ -22,9 +22,9 @@ services:
   grpc-proxy:
     image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest}
     environment:
-      - BACKEND_ADDR=grpc-api:8080
+      - BACKEND_ADDR=server:8080
     depends_on:
-      - grpc-api
+      - server
     expose:
       - '8080'
 
@@ -33,7 +33,7 @@ services:
     depends_on:
       - web
       - grpc-proxy
-      - grpc-api
+      - server
     ports:
       - "${PORT:-10000}:10000"
 

diff --git a/containers/python/base/docker-compose.yml b/containers/python/base/docker-compose.yml
@@ -1,8 +1,8 @@
 version: "3.4"
 
 services:
-  grpc-api:
-    image: ghcr.io/deephaven/grpc-api:${VERSION:-latest}
+  server:
+    image: ghcr.io/deephaven/server:${VERSION:-latest}
     expose:
       - '8080'
     volumes:
@@ -22,9 +22,9 @@ services:
   grpc-proxy:
     image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest}
     environment:
-      - BACKEND_ADDR=grpc-api:8080
+      - BACKEND_ADDR=server:8080
     depends_on:
-      - grpc-api
+      - server
     expose:
       - '8080'
 
@@ -33,7 +33,7 @@ services:
     depends_on:
       - web
       - grpc-proxy
-      - grpc-api
+      - server
     ports:
       - "${PORT:-10000}:10000"