FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

swap back to using latest,cpu,gpu tags for images by BryonLewis · Pull Request #1655 · Kitware/dive · GitHub

/ dive Public
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .default  (1) .md  (2) .vue  (1) .yml  (1) All 4 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
4 changes: 2 additions & 2 deletions .env.default
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ COMPOSE_PROFILES=gpu
#GIRDER_SETTING_WORKER_API_URL=http://girder:8080/api/v1
#GIRDER_NOTIFICATION_REDIS_URL=redis://redis:6379

# Docker image tag for kitware/viame-web and workers (Girder 5 builds)
#TAG=girder-5
# Docker image tag for kitware/viame-web (workers use cpu/gpu tags in compose)
#TAG=latest

# RabbitMQ User Queue configs
# the user requires administrator permissions in rabbitmq management plugin
Expand Down
2 changes: 1 addition & 1 deletion client/platform/web-girder/views/Jobs.vue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ export default defineComponent({
-e "DIVE_USERNAME=username" \
-e "DIVE_PASSWORD=CHANGEME" \
-e "DIVE_API_URL=https://viame.kitware.com/api/v1" \
kitware/viame-worker:girder-5</pre>
kitware/viame-worker:gpu</pre>
</v-card-text>
</v-card>
</v-card>
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ x-worker: &base-worker
build:
context: .
dockerfile: docker/girder_worker.Dockerfile
image: dive/viame-worker:girder-5-cpu
image: dive/viame-worker:cpu
volumes:
- addons:/tmp/addons:ro # readonly
labels:
Expand Down Expand Up @@ -60,7 +60,7 @@ services:
build:
context: .
dockerfile: docker/girder.Dockerfile
image: kitware/viame-web:${TAG:-girder-5}
image: kitware/viame-web:${TAG:-latest}
profiles:
- gpu
- cpu
Expand All @@ -84,7 +84,7 @@ services:
build:
context: .
dockerfile: docker/girder.Dockerfile
image: kitware/viame-web:${TAG:-girder-5}
image: kitware/viame-web:${TAG:-latest}
init: true
command: ["--mode", "production"]
depends_on:
Expand Down Expand Up @@ -152,7 +152,7 @@ services:
build:
context: .
dockerfile: docker/girder_worker_gpu.Dockerfile
image: dev/viame-worker:girder-5gpu
image: dev/viame-worker:gpu
restart: always
deploy:
resources:
Expand Down
4 changes: 2 additions & 2 deletions docs/Deployment-Docker-Compose.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Start here once you have SSH access and `sudo` privileges for a server or VM.

## Container Images

A DIVE Web deployment consists of 2 main application images (Girder 5 builds use the `girder-5` tag unless overridden with `TAG` in `.env`):
A DIVE Web deployment consists of 2 main application images (default tag `latest`; override with `TAG` in `.env`):

* [kitware/viame-web](https://hub.docker.com/r/kitware/viame-web) — Girder web server and bundled Vue client
* [kitware/viame-worker](https://hub.docker.com/r/kitware/viame-worker) — Celery workers for transcoding, pipelines, and training
Expand Down Expand Up @@ -243,7 +243,7 @@ docker run --rm --name dive_worker \
-e "DIVE_USERNAME=CHANGEME" \
-e "DIVE_PASSWORD=CHANGEME" \
-e "DIVE_API_URL=https://viame.kitware.com/api/v1" \
kitware/viame-worker:girder-5
kitware/viame-worker:latest
```

### Development: `localworker`
Expand Down
4 changes: 2 additions & 2 deletions docs/Deployment-Girder-5-Upgrade.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ For general deployment steps, see [Running with Docker Compose](Deployment-Docke

| Change | Action required |
|--------|-----------------|
| **Girder 5** | Pull or build images tagged `girder-5` (see `TAG` in `.env`). |
| **Girder 5** | Pull or build `kitware/viame-web` and `kitware/viame-worker` images (default tag `latest`; see `TAG` in `.env`). |
| **Redis** | Add a Redis service; required for job and UI notifications. |
| **Notifications** | The web client uses WebSockets (not the legacy Girder EventStream). Ensure browsers can reach the Girder API and that Redis is running. |
| **Environment variables** | Rename broker and worker API settings (table below). |
Expand All @@ -32,7 +32,7 @@ Update your `.env` (and any external orchestration) to use Girder 5 names:

1. **Back up** MongoDB and any asset store data before upgrading.
2. **Merge or checkout** the Girder 5 branch and copy `.env.default` changes into your `.env`.
3. **Set image tag**, for example `TAG=girder-5`, or pull images that publish that tag.
3. **Set image tag** if needed (for example `TAG=latest` in `.env`), then pull images.
4. **Add Redis** — use the `redis` service from `docker-compose.yml` or an external Redis instance and set `GIRDER_NOTIFICATION_REDIS_URL` on `girder` and all worker services.
5. **Rename variables** in `.env` per the table above.
6. **Multi-node deployments:** set `GIRDER_WORKER_BROKER` to your RabbitMQ URL and `GIRDER_SETTING_WORKER_API_URL` to your Girder API URL on every worker host; workers must reach Redis used by the web tier if they rely on notification-related features configured in Compose.
Expand Down
Loading

Back | FazBrowse Home | New Git URL