Merge remote-tracking branch 'upstream/main' into ubuntu-24.04

deephaven · Jul 17, 2024 · 6b28191 · 6b28191
2 parents aa2afda + 1a71d3f
commit 6b28191
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 21 deletions.
diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
@@ -18,7 +18,7 @@ concurrency: release
 
 jobs:
   assemble-deephaven-core:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout deephaven-core
         uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
 
   bake-images:
     needs: assemble-deephaven-core
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -96,7 +96,7 @@ jobs:
           cp artifacts/server/jetty-app/build/distributions/server-jetty-${{ steps.artifact_metadata.outputs.deephaven_version }}.tar contexts/server-slim/
 
       - name: Bake
-        uses: docker/bake-action@v5.1.0
+        uses: docker/bake-action@v5.4.0
         with:
           targets: ${{ github.event.inputs.bake_targets }}
           files: server.hcl,server-slim.hcl,server-base.hcl,server-slim-base.hcl

diff --git a/.github/workflows/edge-ci.yml b/.github/workflows/edge-ci.yml
@@ -17,7 +17,7 @@ jobs:
       # Forks don't need to run the scheduled cron
     if: ${{ github.repository_owner == 'deephaven' || github.event_name != 'schedule' }}
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout deephaven-core
         uses: actions/checkout@v4
@@ -59,7 +59,7 @@ jobs:
     if: ${{ github.repository_owner == 'deephaven' || github.event_name != 'schedule' }}
 
     needs: assemble-deephaven-core
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -97,7 +97,7 @@ jobs:
           cp artifacts/server/jetty-app/build/distributions/server-jetty-${{ steps.artifact_metadata.outputs.deephaven_version }}.tar contexts/server-slim/
 
       - name: Bake
-        uses: docker/bake-action@v5.1.0
+        uses: docker/bake-action@v5.4.0
         with:
           targets: server,server-slim,server-base,server-slim-base,server-ui
           files: server.hcl,server-slim.hcl,server-base.hcl,server-slim-base.hcl

diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -11,7 +11,7 @@ concurrency: release
 
 jobs:
   build:
-    runs-on: ubuntu-22.04-4-16
+    runs-on: ubuntu-24.04-4-16
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -30,7 +30,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Bake
-        uses: docker/bake-action@v5.1.0
+        uses: docker/bake-action@v5.4.0
         with:
           # targets: server,server-slim,server-all-ai,server-nltk,server-pytorch,server-sklearn,server-tensorflow,server-ui
           targets: server,server-slim,server-ui

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ docker run \
     --rm \
     --name deephaven \
     -p 10000:10000 \
-    ghcr.io/deephaven/server:0.34.3
+    ghcr.io/deephaven/server:0.35.0
 ```
 
 This will start the server, and the web UI will be available at [http://localhost:10000](http://localhost:10000).
@@ -20,14 +20,14 @@ This will start the server, and the web UI will be available at [http://localhos
 
 The following server images are currently being produced:
 
-* `ghcr.io/deephaven/server:0.34.3`
-* `ghcr.io/deephaven/server-ui:0.34.3`
-* `ghcr.io/deephaven/server-slim:0.34.3`
-* `ghcr.io/deephaven/server-all-ai:0.34.3`
-* `ghcr.io/deephaven/server-nltk:0.34.3`
-* `ghcr.io/deephaven/server-pytorch:0.34.3`
-* `ghcr.io/deephaven/server-sklearn:0.34.3`
-* `ghcr.io/deephaven/server-tensorflow:0.34.3`
+* `ghcr.io/deephaven/server:0.35.0`
+* `ghcr.io/deephaven/server-ui:0.35.0`
+* `ghcr.io/deephaven/server-slim:0.35.0`
+* `ghcr.io/deephaven/server-all-ai:0.35.0`
+* `ghcr.io/deephaven/server-nltk:0.35.0`
+* `ghcr.io/deephaven/server-pytorch:0.35.0`
+* `ghcr.io/deephaven/server-sklearn:0.35.0`
+* `ghcr.io/deephaven/server-tensorflow:0.35.0`
 
 ### Linux
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,8 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+We strongly encourage you to report potential security vulnerabilities via one of the following methods:
+
+* A private GitHub security advisory, https://github.com/deephaven/deephaven-server-docker/security/advisories/new
+* An email to Deephaven's private security list, [email protected]
diff --git a/contexts/server-base/requirements.txt b/contexts/server-base/requirements.txt
@@ -18,7 +18,7 @@ wheel
 java-utilities
 
 # optional autocomplete feature
-jedi==0.18.2
+jedi==0.19.1
 
 # optional adbc feature
 adbc-driver-manager

diff --git a/contexts/server-base/type/server-all-ai/requirements.txt b/contexts/server-base/type/server-all-ai/requirements.txt
@@ -5,7 +5,7 @@ numpy
 pandas>=1.5.0
 pyarrow
 numba; python_version < "3.12"
-jedi==0.18.2
+jedi==0.19.1
 nltk
 tensorflow
 torch

diff --git a/server-slim.hcl b/server-slim.hcl
@@ -25,7 +25,7 @@ variable "DEEPHAVEN_SOURCES" {
 }
 
 variable "DEEPHAVEN_VERSION" {
-    default = "0.34.3"
+    default = "0.35.0"
 }
 
 variable "OPENJDK_VERSION" {

diff --git a/server.hcl b/server.hcl
@@ -36,7 +36,7 @@ variable "DEEPHAVEN_SOURCES" {
 }
 
 variable "DEEPHAVEN_VERSION" {
-    default = "0.34.3"
+    default = "0.35.0"
 }
 
 variable "DEEPHAVEN_CORE_WHEEL" {