Update docker-compose.yml (#1133)

* Update docker-compose.yml

    * Add new service for package-scan-worker

Signed-off-by: Jono Yang <jyang@nexb.com>

* Create separate docker-compose for scan queue worker

Signed-off-by: Jono Yang <jyang@nexb.com>

* Rename purldb-scan-queue-worker command to purldb-scan-worker

    * Update docker-compose for purldb scan worker to include docker-compose.yml, rather than copy the contents
    * Update CHANGELOG.rst

Signed-off-by: Jono Yang <jyang@nexb.com>

---------

Signed-off-by: Jono Yang <jyang@nexb.com>

Author: JonoYang

CHANGELOG.rst

@@ -11,6 +11,11 @@ v34.4.0 (unreleased)
   Also, the CycloneDX outputs can be downloaded as 1.6, 1.5, and 1.4 spec versions.
   https://github.com/nexB/scancode.io/pull/1165
 
+- Rename the `purldb-scan-queue-worker` management command to `purldb-scan-worker`.
+
+- Add `docker-compose.purldb-scan-worker.yml` to run ScanCode.io as a PurlDB
+  scan worker service.
+
 v34.3.0 (2024-04-10)
 --------------------
 

docker-compose.purldb-scan-worker.yml

@@ -0,0 +1,19 @@
+version: "3"
+
+include:
+  - docker-compose.yml
+
+services:
+  purldb_scan_worker:
+    build: .
+    command: wait-for-it --strict --timeout=120 web:8000 -- sh -c "
+        ./manage.py purldb-scan-worker --async --sleep 3"
+    env_file:
+      - docker.env
+    volumes:
+      - .env:/opt/scancodeio/.env
+      - /etc/scancodeio/:/etc/scancodeio/
+      - workspace:/var/scancodeio/workspace/
+    depends_on:
+      - db
+      - web

scanpipe/management/commands/purldb-scan-queue-worker.py renamed to scanpipe/management/commands/purldb-scan-worker.py

@@ -627,7 +627,7 @@ def test_scanpipe_management_command_purldb_scan_queue_worker(
         ]
         out = StringIO()
         with mock.patch("scanpipe.tasks.execute_pipeline_task", task_success):
-            call_command("purldb-scan-queue-worker", *options, stdout=out)
+            call_command("purldb-scan-worker", *options, stdout=out)
 
         out_value = out.getvalue()
         self.assertIn(
@@ -682,7 +682,7 @@ def test_scanpipe_management_command_purldb_scan_queue_worker_failure(
         ]
         out = StringIO()
         with mock.patch("scanpipe.tasks.execute_pipeline_task", task_failure):
-            call_command("purldb-scan-queue-worker", *options, stdout=out, stderr=out)
+            call_command("purldb-scan-worker", *options, stdout=out, stderr=out)
 
         out_value = out.getvalue()
         self.assertIn("Exception occured during scan project:", out_value)
@@ -739,7 +739,7 @@ def test_scanpipe_management_command_purldb_scan_queue_worker_continue_after_fai
         ]
         out = StringIO()
         with mock.patch("scanpipe.tasks.execute_pipeline_task", task_failure):
-            call_command("purldb-scan-queue-worker", *options, stdout=out, stderr=out)
+            call_command("purldb-scan-worker", *options, stdout=out, stderr=out)
 
         out_value = out.getvalue()
         self.assertIn(