Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add deephaven-plugin-ui (and other plugins) to base server image #118

Merged
merged 3 commits into from
Sep 27, 2024
Merged

Add deephaven-plugin-ui (and other plugins) to base server image #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9e0dd7
Add deephaven-plugin-ui (and other plugins) to base server image
mofojed Sep 17, 2024
3f7ea9f
Add -ui tag to to the server images
devinrsmith Sep 26, 2024
69ebc98
Merge pull request #1 from devinrsmith/deephaven.ui-core
mofojed Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/edge-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ 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
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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
- name: Bake
uses: docker/[email protected]
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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Bake
uses: docker/[email protected]
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:
Expand Down
22 changes: 11 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
- `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

Expand Down Expand Up @@ -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/)
3 changes: 0 additions & 3 deletions contexts/server/type/server-ui/requirements.txt
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions contexts/server/type/server/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
deephaven-plugin-matplotlib>=0.5.0
deephaven-plugin-plotly-express>=0.11.2
deephaven-plugin-ui>=0.21.0
2 changes: 0 additions & 2 deletions server-base.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 4 additions & 14 deletions server.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ group "extra" {
"server-nltk",
"server-pytorch",
"server-sklearn",
"server-tensorflow",
"server-ui"
"server-tensorflow"
]
}

Expand Down Expand Up @@ -92,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"
Expand Down Expand Up @@ -156,17 +157,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}" : ""
Comment on lines -162 to -163
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can continue producing server-ui images by just tagging the server images with these tags in the server target; I think we should prefer to do this for at least one release, at which point we can consider removing them.

]
args = {
REQUIREMENTS_TYPE = "server-ui"
}
}

# -------------------------------------

target "server-context" {
Expand Down