fixing the spicedb docker compose setup (#15)

Makefile

@@ -63,10 +63,6 @@ all:
 	make config;
 	make generate;
 
-db:
-	./spicedb/start-postgresql.sh
-.PHONY: db
-
 spicedb:
 	./spicedb/start-spicedb.sh
 .PHONY: spicedb

README.md

@@ -48,9 +48,6 @@ wire
 
 ## Spicedb using docker/podman
 
-# Run the postgresql db
-`make db`
-
 ## Run the spicedb
 `make spicedb`
 

spicedb/docker-compose.yaml → docker-compose.yaml

@@ -1,27 +1,10 @@
----
-# This runs SpiceDB, using Postgres as the storage engine. SpiceDB will not have
-# any schema written to it.
-#
-# Once the database service is running, the migrate service executes, running
-# "spicedb migrate head" to migrate Postgres to the most current revision. After
-# Postgres is migrated, the migrate service will stop.
-#
-# SpiceDB settings:
-#   pre-shared key: foobar
-#   dashboard address: http://localhost:8080
-#   metrics address: http://localhost:9090
-#   grpc address: http://localhost:50051
-#
-# Postgres settings:
-#   user: postgres
-#   password: secret
-#   port: 5432
-
 version: "3"
 
 services:
   rebac:
     image: "quay.io/ciam_authz/insights-rebac:latest"
+    build:
+      dockerfile: Dockerfile
     profiles: ["rebac"]
     restart: "always"
     ports:

spicedb/start-insights-rebac.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 set -e
-docker-compose --profile rebac -f ./spicedb/docker-compose.yaml up -d
+docker-compose --env-file ./spicedb/.env --profile rebac -f ./docker-compose.yaml up -d --build

spicedb/start-spicedb.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 set -e
-docker-compose --env-file ./spicedb/.env -f ./spicedb/docker-compose.yaml up -d
+docker-compose --env-file ./spicedb/.env -f ./docker-compose.yaml up -d

spicedb/teardown.sh

@@ -4,12 +4,6 @@ source ./spicedb/check_docker_podman.sh
 
 set -e
 
-$DOCKER stop spicedb-datastore
-
-$DOCKER rm spicedb-datastore
-
-$DOCKER network rm spicedb-net
-
-docker-compose -f ./spicedb/docker-compose.yaml down
+docker-compose --env-file ./spicedb/.env -f ./docker-compose.yaml down