You've already forked docker-mailserver
mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2025-08-08 23:06:49 +02:00
Improve container/image name detection
Problem: `setup.sh` fails, if more than one container uses `CMD ["supervisord", "-c", "/etc/supervisor/supervisord.conf"]` Current container/image name detection: List all containers, grep for "supervisor". New approach: List container, with label `org.label-schema.name="docker-mailserver"`
This commit is contained in:
9
setup.sh
9
setup.sh
@ -25,13 +25,10 @@ if [ -z "$CRI" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
INFO=$($CRI ps \
|
||||
--no-trunc \
|
||||
--format="{{.Image}} {{.Names}} {{.Command}}" | \
|
||||
grep "supervisord -c /etc/supervisor/supervisord.conf")
|
||||
INFO=$($CRI ps --no-trunc --format "{{.Image}};{{.Names}}" --filter label=org.label-schema.name="docker-mailserver")
|
||||
|
||||
IMAGE_NAME=$(echo $INFO | awk '{print $1}')
|
||||
CONTAINER_NAME=$(echo $INFO | awk '{print $2}')
|
||||
IMAGE_NAME=${INFO%;*}
|
||||
CONTAINER_NAME=${INFO#*;}
|
||||
DEFAULT_CONFIG_PATH="$(pwd)/config"
|
||||
USE_CONTAINER=false
|
||||
|
||||
|
Reference in New Issue
Block a user