From 2003420875979c4ad02c75714db7027094628e2a Mon Sep 17 00:00:00 2001 From: Mark McLaughlin Date: Thu, 13 Jun 2024 14:50:17 +0100 Subject: [PATCH] Fix docker/podman discovery script for podman-compose. (#96) * Fix docker/podman discovery script for podman-compose. * Fix docker/podman discovery in Makefile -- fixes lint and pr-check. * Update to correct kessel relations image location. * Remove superfluous and obsolete -compose check. --- Makefile | 4 +--- docker-compose.yaml | 2 +- spicedb/check_docker_podman.sh | 8 -------- 3 files changed, 2 insertions(+), 12 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. 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" diff --git a/spicedb/check_docker_podman.sh b/spicedb/check_docker_podman.sh index cce75b8..de4d23c 100755 --- a/spicedb/check_docker_podman.sh +++ b/spicedb/check_docker_podman.sh @@ -18,13 +18,5 @@ else echo "Podman not found. Please install either Docker or Podman to proceed." exit 1 fi - - # Check if Podman 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 - fi fi