Skip to content

Commit

Permalink
Fix docker/podman discovery script for podman-compose. (#96)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
merlante authored Jun 13, 2024
1 parent f6879cd commit 2003420
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 12 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions spicedb/check_docker_podman.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 2003420

Please sign in to comment.