From d7b4f66ff8eecbdabab51eec242a8ca9404d7955 Mon Sep 17 00:00:00 2001
From: Mark McLaughlin <mmclaugh@redhat.com>
Date: Thu, 13 Jun 2024 10:45:31 +0100
Subject: [PATCH 1/4] Fix docker/podman discovery script for podman-compose.

---
 spicedb/check_docker_podman.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/spicedb/check_docker_podman.sh b/spicedb/check_docker_podman.sh
index cce75b8..778c6b6 100755
--- a/spicedb/check_docker_podman.sh
+++ b/spicedb/check_docker_podman.sh
@@ -19,12 +19,18 @@ else
     exit 1
   fi
 
-   # Check if Podman is installed
+   # Check if docker-compose is installed
     if command_exists docker-compose; then
       echo "docker-compose is installed."
     else
-      echo "docker-compose not found. Please install either docker-compose or podman-compose to proceed."
-      exit 1
+
+      # Check if podman-compose is installed
+      if command_exists podman-compose; then
+        echo "podman-compose is installed."
+      else
+        echo "docker-compose or podman-compose not found. Please install either docker-compose or podman-compose to proceed."
+        exit 1
+      fi
     fi
 fi
 

From 3439d024c7a755978ab3079168f4e0a5b546ab2f Mon Sep 17 00:00:00 2001
From: Mark McLaughlin <mmclaugh@redhat.com>
Date: Thu, 13 Jun 2024 12:10:50 +0100
Subject: [PATCH 2/4] Fix docker/podman discovery in Makefile -- fixes lint and
 pr-check.

---
 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7dda1a3..ed90760 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,7 @@
 GOHOSTOS:=$(shell go env GOHOSTOS)
 GOPATH:=$(shell go env GOPATH)
 VERSION=$(shell git describe --tags --always)
-
-DOCKER ?= docker
-DOCKER_CONFIG="${PWD}/.docker"
+DOCKER := $(shell type -P podman || type -P docker)
 
 ifeq ($(GOHOSTOS), windows)
 	#the `find.exe` is different from `find` in bash/shell.

From bccb328f320e3c5437c387458daf81d4da5b29c1 Mon Sep 17 00:00:00 2001
From: Mark McLaughlin <mmclaugh@redhat.com>
Date: Thu, 13 Jun 2024 12:36:02 +0100
Subject: [PATCH 3/4] Update to correct kessel relations image location.

---
 docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8cd2689..56e92ac 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   rebac:
-    image: "quay.io/ciam_authz/insights-rebac:latest"
+    image: "quay.io/cloudservices/kessel-relations:latest"
     environment:
       - "SPICEDB_PRESHARED=${SPICEDB_GRPC_PRESHARED_KEY}"
       # - "SPICEDB_PRESHARED_FILE=/run/secrets/spicedb_pre_shared"

From 60aa58cde7564116051f9b2a58910214fb810bf4 Mon Sep 17 00:00:00 2001
From: Mark McLaughlin <mmclaugh@redhat.com>
Date: Thu, 13 Jun 2024 14:28:38 +0100
Subject: [PATCH 4/4] Remove superfluous and obsolete -compose check.

---
 spicedb/check_docker_podman.sh | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/spicedb/check_docker_podman.sh b/spicedb/check_docker_podman.sh
index 778c6b6..de4d23c 100755
--- a/spicedb/check_docker_podman.sh
+++ b/spicedb/check_docker_podman.sh
@@ -18,19 +18,5 @@ else
     echo "Podman not found. Please install either Docker or Podman to proceed."
     exit 1
   fi
-
-   # Check if docker-compose is installed
-    if command_exists docker-compose; then
-      echo "docker-compose is installed."
-    else
-
-      # Check if podman-compose is installed
-      if command_exists podman-compose; then
-        echo "podman-compose is installed."
-      else
-        echo "docker-compose or podman-compose not found. Please install either docker-compose or podman-compose to proceed."
-        exit 1
-      fi
-    fi
 fi