Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix docker/podman discovery script for podman-compose. #96

Merged
merged 4 commits into from
Jun 13, 2024
Merged

Fix docker/podman discovery script for podman-compose. #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7b4f66
Fix docker/podman discovery script for podman-compose.
merlante Jun 13, 2024
3439d02
Fix docker/podman discovery in Makefile -- fixes lint and pr-check.
merlante Jun 13, 2024
bccb328
Update to correct kessel relations image location.
merlante Jun 13, 2024
60aa58c
Remove superfluous and obsolete -compose check.
merlante Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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

Loading