diff --git a/admin/lib/common.inc.bash b/admin/lib/common.inc.bash index db7eb4ee..4c4e9fc6 100644 --- a/admin/lib/common.inc.bash +++ b/admin/lib/common.inc.bash @@ -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'" @@ -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'" diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 1635e277..f94cf9bc 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -5,7 +5,7 @@ services: ports: - "5432:5432" - solr: + search: ports: - "8983:8983"