Skip to content

Commit

Permalink
Fix production files
Browse files Browse the repository at this point in the history
Add support for Anthropic key
Add support for multiple provisionning files
Fix mistakes in prod provisionning file
  • Loading branch information
pchoisel committed Nov 25, 2024
1 parent 1842854 commit 7758eb9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion devops/girder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN pip install -e .[all] -r requirements-test.txt --find-links https://girder.g
RUN pip install girder[mount] girder girder-user-quota git+https://github.com/DigitalSlideArchive/import-tracker.git
# RUN pip install .[all] ./girder[tasks] girder[mount] --find-links https://girder.github.io/large_image_wheels

COPY ./provision.py /src/provision.py
COPY ./provision*.py /src/
COPY ./girder.cfg /etc/girder.cfg

RUN pip install fastjsonschema
Expand Down
4 changes: 3 additions & 1 deletion devops/girder/provision-prod.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import os

from girder.models.setting import Setting
from girder.utility.server import configureServer

if __name__ == "__main__":
configureServer()
# Set various settings through env variables.
# If the associated env variable does not exist. Use Girder's default
Setting().set("worker.api_url", os.environ.get(
"GIRDER_WORKER_API_URL", "http://girder:8080/api/v1"))
Setting().set("worker.broker", os.environ.get(
"GIRDER_WORKER_BROKER", "amqp://guest:guest@localhost/"))
Setting().set("worker.api_url", os.environ.get(
Setting().set("worker.backend", os.environ.get(
"GIRDER_WORKER_BACKEND", "rpc://guest:guest@localhost/"))
Setting().set("core.email_from_address", os.environ.get(
"GIRDER_EMAIL_FROM", "Girder <[email protected]>"))
Expand Down
2 changes: 0 additions & 2 deletions docker-compose-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ services:
env_file:
- "./docker.env"
- "./docker-prod.env"
environment:
- ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
container_name: "girder"

memcached:
Expand Down

0 comments on commit 7758eb9

Please sign in to comment.