Skip to content

Commit

Permalink
Implement chrisomatic
Browse files Browse the repository at this point in the history
  • Loading branch information
jennydaman committed Aug 29, 2024
1 parent beb6f5f commit 5aac397
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
7 changes: 5 additions & 2 deletions docker-compose_just.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ services:
profiles:
- tools
volumes:
- "./chrisomatic/chrisomatic.yml:/chrisomatic.yml"
- "./chrisomatic:/etc/chrisomatic:ro"
- "/var/run/docker.sock:/var/run/docker.sock"
working_dir: /etc/chrisomatic
userns_mode: host
depends_on:
- chris
Expand Down Expand Up @@ -41,7 +42,9 @@ services:
cube-nonroot-user-volume-fix:
condition: service_completed_successfully
networks:
- local
local:
aliases:
- chrisdev.local # hard-coded in chrisomatic/*.yml
worker-mains:
image: ${CUBE_IMAGE:-localhost/fnndsc/cube:dev}
command: celery -A core worker -c 4 -l info -Q main1,main2
Expand Down
9 changes: 4 additions & 5 deletions justfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
compose_file := 'docker-compose_just.yml'

# Start the ChRIS backend in development mode, and attach to the live-reloading server.
dev: start attach
dev: chrisomatic attach

# Start the ChRIS backend in development mode.
start: start-ancillary migrate up
Expand All @@ -19,12 +19,11 @@ shell: (run 'python manage.py shell')
bash: (run 'bash')

# Run chrisomatic, a tool which adds plugins and users to CUBE.
chrisomatic: start
# TODO
chrisomatic *args: start
@just docker-compose --profile=cube run --rm chrisomatic chrisomatic {{args}}

# Run chrisomatic with the contents of chrisomatic/postscript.yml
postscript: start
# TODO
postscript: (chrisomatic 'postscript.yml')

# Perform database migrations.
migrate: (run 'python manage.py migrate --noinput')
Expand Down

0 comments on commit 5aac397

Please sign in to comment.