Skip to content

Commit 04ac3b7

Browse files
committed
add redis, update girder-5 branch for plugin references
1 parent 6a20108 commit 04ac3b7

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

docker-compose.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,13 @@ services:
4848
volumes:
4949
# Use env config path, default to docker volume
5050
- ${MONGO_DB_PATH:-mongo_db}:/data/db
51-
51+
redis:
52+
image: redis:latest
53+
ports:
54+
- "6379:6379"
55+
volumes:
56+
- redis_data:/data
57+
5258
girder:
5359
build:
5460
context: .
@@ -74,6 +80,8 @@ services:
7480
- "GIRDER_WORKER_BACKEND=${GIRDER_WORKER_BACKEND:-rpc://guest:guest@localhost/}"
7581
- "GIRDER_SETTING_WORKER_API_URL=${GIRDER_SETTING_WORKER_API_URL:-http://girder:8080/api/v1}"
7682
- "GIRDER_STATIC_ROOT_DIR=/opt/dive/clients/girder"
83+
- "GIRDER_NOTIFICATION_REDIS_URL=redis://redis:6379"
84+
7785
# Rabbitmq management variables
7886
- "RABBITMQ_MANAGEMENT_USERNAME=${RABBITMQ_MANAGEMENT_USERNAME:-guest}"
7987
- "RABBITMQ_MANAGEMENT_PASSWORD=${RABBITMQ_MANAGEMENT_PASSWORD:-guest}"
@@ -122,6 +130,9 @@ services:
122130
- "GIRDER_WORKER_BROKER=${GIRDER_WORKER_BROKER:-amqp://guest:guest@rabbit/default}"
123131
- "GIRDER_WORKER_BACKEND=${GIRDER_WORKER_BACKEND:-rpc://guest:guest@localhost/}"
124132
- "GIRDER_SETTING_WORKER_API_URL=${GIRDER_SETTING_WORKER_API_URL:-http://girder:8080/api/v1}"
133+
- "GIRDER_MONGO_URI=mongodb://mongodb:27017/girder"
134+
- "GIRDER_NOTIFICATION_REDIS_URL=redis://redis:6379"
135+
125136

126137
girder_worker_training:
127138
# Merge base-worker object with this config
@@ -141,7 +152,9 @@ services:
141152
- "GIRDER_WORKER_BACKEND=${GIRDER_WORKER_BACKEND:-rpc://guest:guest@localhost/}"
142153
- "GIRDER_SETTING_WORKER_API_URL=${GIRDER_SETTING_WORKER_API_URL:-http://girder:8080/api/v1}"
143154

155+
144156
volumes:
145157
addons:
146158
mongo_db:
147159
girder_assetstore:
160+
redis_data:

docker/girder.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ from node:20 as girder-client-builder
1616
WORKDIR /app
1717
RUN apt-get update && apt-get install -y git
1818
# make sure I clone
19+
ARG CACHEBUST=2
1920
RUN git clone https://github.com/girder/girder.git
20-
RUN cd girder/girder && git checkout v4-integration && cd web && npm install && npx vite build --base=/girder/
21+
RUN cd girder/girder && git checkout plugin-client-path-fix && cd web && npm install && npx vite build --base=/girder/
2122

2223

2324

0 commit comments

Comments
 (0)