Merge pull request #26 from minvws/release1.1

release1.1

Author: underdarknl

.env-dist

@@ -30,6 +30,7 @@ OCTOPOES_API=http://octopoes_api:80
 BYTES_API=http://bytes:8000
 XTDB_URI=http://crux:3000
 XTDB_TYPE=xtdb
+SCHEDULER_API=http://scheduler:8000
 
 # Boefjes
 WP_SCAN_API=
@@ -79,3 +80,4 @@ SCHEDULER_PQ_MAXSIZE=1000
 SCHEDULER_PQ_INTERVAL=60
 SCHEDULER_DSP_BROKER_URL=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@rabbitmq:5672/${RABBITMQ_DEFAULT_VHOST}
 SCHEDULER_RABBITMQ_DSN=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@rabbitmq:5672/${RABBITMQ_DEFAULT_VHOST}
+SCHEDULER_DB_DSN=sqlite:///

Makefile

@@ -38,9 +38,15 @@ rebuild:
 	make build
 	make up
 
+update:
+	-docker-compose down
+	make pull
+	make build
+	make up
+
 clean:
 	-docker-compose down
-	-docker volume rm nl-kat_rocky-db-data nl-kat_bytes-db-data nl-kat_katalogus-db-data
+	-docker volume rm nl-kat_rocky-db-data nl-kat_bytes-db-data nl-kat_katalogus-db-data nl-kat_xtdb-data
 
 up:
 	docker-compose up -d --force-recreate rocky
@@ -90,7 +96,11 @@ pull-reset:
 	-git -C nl-kat-rocky pull
 
 build:  # Build should prepare all other services: migrate them, seed them, etc.
-	docker-compose build
+ifeq ($(UNAME), Darwin)
+	docker-compose build --build-arg USER_UID="$$(id -u)"
+else
+	docker-compose build --build-arg USER_UID="$$(id -u)" --build-arg USER_GID="$$(id -g)"
+endif
 	docker-compose run --rm rocky make build
 	make -C nl-kat-boefjes build
 	make -C nl-kat-bytes build

docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.9"
 services:
   rabbitmq:
     restart: on-failure
-    image: "rabbitmq:3-management"
+    image: "rabbitmq:3.9-management"
     ports:
       - "127.0.0.1:5672:5672"
       - "127.0.0.1:15672:15672"
@@ -15,10 +15,12 @@ services:
       - .env
 
   crux:
-    image: juxt/xtdb-in-memory:1.20.0
+    image: "juxt/xtdb-standalone-rocksdb:1.21.0"
     restart: on-failure
     ports:
       - "127.0.0.1:3000:3000"
+    volumes:
+      - xtdb-data:/usr/lib/xtdb/data
 
   octopoes_api:
     restart: on-failure
@@ -202,3 +204,4 @@ volumes:
   rocky-db-data:
   bytes-db-data:
   katalogus-db-data:
+  xtdb-data: