Merge pull request #1535 from casperklein/patch-2
Improve container/image name detection
This commit is contained in:
commit
3ce36407b4
9
setup.sh
9
setup.sh
|
@ -27,11 +27,12 @@ fi
|
||||||
|
|
||||||
INFO=$($CRI ps \
|
INFO=$($CRI ps \
|
||||||
--no-trunc \
|
--no-trunc \
|
||||||
--format="{{.Image}} {{.Names}} {{.Command}}" | \
|
--format "{{.Image}};{{.Names}}" \
|
||||||
grep "supervisord -c /etc/supervisor/supervisord.conf")
|
--filter label=org.label-schema.name="docker-mailserver" | \
|
||||||
|
tail -1)
|
||||||
|
|
||||||
IMAGE_NAME=$(echo $INFO | awk '{print $1}')
|
IMAGE_NAME=${INFO%;*}
|
||||||
CONTAINER_NAME=$(echo $INFO | awk '{print $2}')
|
CONTAINER_NAME=${INFO#*;}
|
||||||
DEFAULT_CONFIG_PATH="$(pwd)/config"
|
DEFAULT_CONFIG_PATH="$(pwd)/config"
|
||||||
USE_CONTAINER=false
|
USE_CONTAINER=false
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue