Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Casper 2020-06-12 01:33:30 +02:00 committed by GitHub
parent 6abcc8ce5f
commit 8c7597f546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setup.sh
View File

@ -25,13 +25,10 @@ if [ -z "$CRI" ]; then
fi fi
fi fi
INFO=$($CRI ps \ INFO=$($CRI ps --no-trunc --format "{{.Image}};{{.Names}}" --filter label=org.label-schema.name="docker-mailserver")
--no-trunc \
--format="{{.Image}} {{.Names}} {{.Command}}" | \
grep "supervisord -c /etc/supervisor/supervisord.conf")
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