From 96e8067ab83cccaee75460c6c75edd73be28d615 Mon Sep 17 00:00:00 2001 From: shaohef Date: Wed, 28 Jun 2023 14:01:06 +0800 Subject: [PATCH 1/2] Container name depends on docker-compose version. Docker compose setup dnsmasq container will join several words to combine container name with "_" or "-". "_" or "-" depends on the docker version. --- dockerfiles/core/init.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/core/init.sh b/dockerfiles/core/init.sh index 4d6dbf4..9df7e46 100755 --- a/dockerfiles/core/init.sh +++ b/dockerfiles/core/init.sh @@ -65,12 +65,12 @@ if [ ! -d ${BUILDER_PATH}/root/.git ]; then fi # Wait for dnsmasq service to start - while (! docker ps | grep _dnsmasq_1 > /dev/null 2>&1 ); do + while (! docker ps | grep -e "[_-]dnsmasq[_-]1" > /dev/null 2>&1 ); do echo "Waiting for dnsmasq to start"; sleep 1; done - TAG_PREFIX_TMP=$(docker ps | grep _dnsmasq_1 | awk '{print $2}' | head -n 1) + TAG_PREFIX_TMP=$(docker ps | grep -e "[_-]dnsmasq[_-]1" | awk '{print $2}' | head -n 1) TAG_PREFIX=${TAG_PREFIX_TMP%%/builder-dnsmasq} IMAGES="builder-core builder-gitea builder-dnsmasq builder-squid builder-web builder-git builder-aws-cli builder-uos builder-qemu builder-certbot builder-smb builder-dyn-profile uos-kernel uos-wlan:v1.0 uos-firmware-wifi:v1.0 uos-dyninit:v1.0" From 1215ef2b0e865882b49aa4b702f17fdd413364cf Mon Sep 17 00:00:00 2001 From: shaohef Date: Wed, 28 Jun 2023 14:06:54 +0800 Subject: [PATCH 2/2] grep -e "[_-]dnsmasq[_-]1" --- dockerfiles/core/init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/core/init.sh b/dockerfiles/core/init.sh index 9df7e46..97636ae 100755 --- a/dockerfiles/core/init.sh +++ b/dockerfiles/core/init.sh @@ -96,7 +96,7 @@ if [ ! -d ${BUILDER_PATH}/root/.git ]; then # Sleeping for user to run build manually sleep 15 ./build.sh -C -S && \ - docker restart $(docker ps | grep _dnsmasq_1 | awk '{print $1}') + docker restart $(docker ps | grep -e "[_-]dnsmasq[_-]1" | awk '{print $1}') fi done else