From c9e0dd79a1f067da7bb82ad96b70e01d411b0005 Mon Sep 17 00:00:00 2001 From: mikebender Date: Tue, 17 Sep 2024 11:29:12 -0400 Subject: [PATCH 1/2] Add deephaven-plugin-ui (and other plugins) to base server image - Deprecate the server-ui image, and just bake the plugins into core --- .github/workflows/edge-ci.yml | 18 ++++++++-------- .github/workflows/release-ci.yml | 6 +++--- README.md | 22 ++++++++++---------- contexts/server/type/server/requirements.txt | 3 +++ server-base.hcl | 2 -- server.hcl | 14 +------------ 6 files changed, 27 insertions(+), 38 deletions(-) diff --git a/.github/workflows/edge-ci.yml b/.github/workflows/edge-ci.yml index b0392f1..96f7758 100644 --- a/.github/workflows/edge-ci.yml +++ b/.github/workflows/edge-ci.yml @@ -2,11 +2,11 @@ name: Edge CI on: schedule: - - cron: '0 3 * * *' + - cron: "0 3 * * *" pull_request: - branches: [ main ] + branches: [main] push: - branches: [ main ] + branches: [main] workflow_dispatch: # For maximum cache coherency, ensure only one outstanding build at any given time @@ -14,7 +14,7 @@ concurrency: release jobs: assemble-deephaven-core: - # Forks don't need to run the scheduled cron + # Forks don't need to run the scheduled cron if: ${{ github.repository_owner == 'deephaven' || github.event_name != 'schedule' }} runs-on: ubuntu-24.04 @@ -34,12 +34,12 @@ jobs: id: setup-java-11 uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: '11' + distribution: "temurin" + java-version: "11" - name: Set JAVA_HOME run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV - + - name: Setup gradle properties run: | .github/scripts/gradle-properties.sh >> gradle.properties @@ -61,7 +61,7 @@ jobs: retention-days: 2 bake-images: - # Forks don't need to run the scheduled cron + # Forks don't need to run the scheduled cron if: ${{ github.repository_owner == 'deephaven' || github.event_name != 'schedule' }} needs: assemble-deephaven-core @@ -105,7 +105,7 @@ jobs: - name: Bake uses: docker/bake-action@v5.7.0 with: - targets: server,server-slim,server-base,server-slim-base,server-ui + targets: server,server-slim,server-base,server-slim-base files: server.hcl,server-slim.hcl,server-base.hcl,server-slim-base.hcl pull: true env: diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index ad142ec..95a99c9 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -2,9 +2,9 @@ name: Release CI on: pull_request: - branches: [ main ] + branches: [main] push: - branches: [ 'main', 'release/v*' ] + branches: ["main", "release/v*"] # For maximum cache coherency, ensure only one outstanding build at any given time concurrency: release @@ -32,7 +32,7 @@ jobs: - name: Bake uses: docker/bake-action@v5.7.0 with: - targets: server,server-slim,server-all-ai,server-nltk,server-pytorch,server-sklearn,server-tensorflow,server-ui + targets: server,server-slim,server-all-ai,server-nltk,server-pytorch,server-sklearn,server-tensorflow files: server.hcl,server-slim.hcl pull: true env: diff --git a/README.md b/README.md index 29a52ed..6407468 100644 --- a/README.md +++ b/README.md @@ -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.35.2` -* `ghcr.io/deephaven/server-ui:0.35.2` -* `ghcr.io/deephaven/server-slim:0.35.2` -* `ghcr.io/deephaven/server-all-ai:0.35.2` -* `ghcr.io/deephaven/server-nltk:0.35.2` -* `ghcr.io/deephaven/server-pytorch:0.35.2` -* `ghcr.io/deephaven/server-sklearn:0.35.2` -* `ghcr.io/deephaven/server-tensorflow:0.35.2` +- `ghcr.io/deephaven/server:0.35.2` +- ~~`ghcr.io/deephaven/server-ui:0.35.2`~~ **Deprecated.** Use `ghcr.io/deephaven/server:0.35.2` instead. +- `ghcr.io/deephaven/server-slim:0.35.2` +- `ghcr.io/deephaven/server-all-ai:0.35.2` +- `ghcr.io/deephaven/server-nltk:0.35.2` +- `ghcr.io/deephaven/server-pytorch:0.35.2` +- `ghcr.io/deephaven/server-sklearn:0.35.2` +- `ghcr.io/deephaven/server-tensorflow:0.35.2` ### Linux @@ -67,6 +67,6 @@ See [RELEASE](RELEASE.md). ## Resources -* [Issues](https://github.com/deephaven/deephaven-server-docker/issues) -* [Deephaven Community Slack](https://deephaven.io/slack) -* [Deephaven Documentation](https://deephaven.io/core/docs/) +- [Issues](https://github.com/deephaven/deephaven-server-docker/issues) +- [Deephaven Community Slack](https://deephaven.io/slack) +- [Deephaven Documentation](https://deephaven.io/core/docs/) diff --git a/contexts/server/type/server/requirements.txt b/contexts/server/type/server/requirements.txt index e69de29..4254696 100644 --- a/contexts/server/type/server/requirements.txt +++ b/contexts/server/type/server/requirements.txt @@ -0,0 +1,3 @@ +deephaven-plugin-matplotlib>=0.5.0 +deephaven-plugin-plotly-express>=0.11.2 +deephaven-plugin-ui>=0.21.0 \ No newline at end of file diff --git a/server-base.hcl b/server-base.hcl index eb3799c..b5b2926 100644 --- a/server-base.hcl +++ b/server-base.hcl @@ -4,8 +4,6 @@ group "default" { ] } -# Note: server-ui is not applicable as a base image at this time as some of the plugins -# explicitly depend on deephaven-core. group "extra" { targets = [ "server-base-all-ai", diff --git a/server.hcl b/server.hcl index ab3457e..4753924 100644 --- a/server.hcl +++ b/server.hcl @@ -10,8 +10,7 @@ group "extra" { "server-nltk", "server-pytorch", "server-sklearn", - "server-tensorflow", - "server-ui" + "server-tensorflow" ] } @@ -156,17 +155,6 @@ target "server-tensorflow" { } } -target "server-ui" { - inherits = [ "server-context" ] - tags = [ - "${REPO_PREFIX}${SERVER_PREFIX}-ui:${TAG}", - equal("latest", TAG) ? "${REPO_PREFIX}${SERVER_PREFIX}-ui:${DEEPHAVEN_VERSION}" : "" - ] - args = { - REQUIREMENTS_TYPE = "server-ui" - } -} - # ------------------------------------- target "server-context" { From 3f7ea9f2fc0267c9ce0a68e5cbf1dda21410332f Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Thu, 26 Sep 2024 16:22:19 -0700 Subject: [PATCH 2/2] Add -ui tag to to the server images --- README.md | 2 +- contexts/server/type/server-ui/requirements.txt | 3 --- server.hcl | 4 +++- 3 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 contexts/server/type/server-ui/requirements.txt diff --git a/README.md b/README.md index 6407468..28a4bae 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ 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.35.2` -- ~~`ghcr.io/deephaven/server-ui:0.35.2`~~ **Deprecated.** Use `ghcr.io/deephaven/server:0.35.2` instead. +- `ghcr.io/deephaven/server-ui:0.35.2` - `ghcr.io/deephaven/server-slim:0.35.2` - `ghcr.io/deephaven/server-all-ai:0.35.2` - `ghcr.io/deephaven/server-nltk:0.35.2` diff --git a/contexts/server/type/server-ui/requirements.txt b/contexts/server/type/server-ui/requirements.txt deleted file mode 100644 index ac879f1..0000000 --- a/contexts/server/type/server-ui/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -deephaven-plugin-matplotlib>=0.3.0 -deephaven-plugin-plotly-express>=0.7.0 -deephaven-plugin-ui>=0.12.0 \ No newline at end of file diff --git a/server.hcl b/server.hcl index 4753924..710fb30 100644 --- a/server.hcl +++ b/server.hcl @@ -91,7 +91,9 @@ target "server" { inherits = [ "server-context" ] tags = [ "${REPO_PREFIX}${SERVER_PREFIX}:${TAG}", - equal("latest", TAG) ? "${REPO_PREFIX}${SERVER_PREFIX}:${DEEPHAVEN_VERSION}" : "" + "${REPO_PREFIX}${SERVER_PREFIX}-ui:${TAG}", + equal("latest", TAG) ? "${REPO_PREFIX}${SERVER_PREFIX}:${DEEPHAVEN_VERSION}" : "", + equal("latest", TAG) ? "${REPO_PREFIX}${SERVER_PREFIX}-ui:${DEEPHAVEN_VERSION}" : "", ] args = { REQUIREMENTS_TYPE = "server"