From 5aac397ac67d04ac1760e34020c3cdaa12317b3d Mon Sep 17 00:00:00 2001
From: Jennings Zhang <dev@sl.jennin.xyz>
Date: Thu, 29 Aug 2024 13:23:11 -0400
Subject: [PATCH] Implement chrisomatic

---
 docker-compose_just.yml | 7 +++++--
 justfile                | 9 ++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docker-compose_just.yml b/docker-compose_just.yml
index 98e2f253..f6aea634 100644
--- a/docker-compose_just.yml
+++ b/docker-compose_just.yml
@@ -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
@@ -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
diff --git a/justfile b/justfile
index 551e0f53..987c636b 100644
--- a/justfile
+++ b/justfile
@@ -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
@@ -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')