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 root access being requested when not required #193

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix root access being requested when not required #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f777980
Fix root access being requested when not required
Jan 2, 2022
e8bfded
Fix docker compose service name
Jan 2, 2022
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
16 changes: 8 additions & 8 deletions admin/lib/common.inc.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ then
DOCKER_CMD='docker'
;;
linux*)
if groups | grep -Eqw 'sudo|wheel'
then
DOCKER_CMD='sudo docker'
elif groups | grep -Eqw 'docker|root'
if groups | grep -Eqw 'docker|root'
then
DOCKER_CMD='docker'
elif groups | grep -Eqw 'sudo|wheel'
then
DOCKER_CMD='sudo docker'
else
echo >&2 "$SCRIPT_NAME: cannot set docker command: please either"
echo >&2 " * add the user '$USER' to the group 'sudo' or 'wheel'"
Expand All @@ -49,12 +49,12 @@ then
DOCKER_COMPOSE_CMD='docker-compose'
;;
linux*)
if groups | grep -Eqw 'sudo|wheel'
then
DOCKER_COMPOSE_CMD='sudo docker-compose'
elif groups | grep -Eqw 'docker-compose|root'
if groups | grep -Eqw 'docker|root'
then
DOCKER_COMPOSE_CMD='docker-compose'
elif groups | grep -Eqw 'sudo|wheel'
then
DOCKER_COMPOSE_CMD='sudo docker-compose'
else
echo >&2 "$SCRIPT_NAME: cannot set docker-compose command: please either"
echo >&2 " * add the user '$USER' to the group 'sudo' or 'wheel'"
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
ports:
- "5432:5432"

solr:
search:
ports:
- "8983:8983"

Expand Down