Skip to content

Container name depends on docker-compose version. #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shaohef wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Container name depends on docker-compose version. #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96e8067
Container name depends on docker-compose version.
shaohef Jun 28, 2023
1215ef2
grep -e "[_-]dnsmasq[_-]1"
shaohef Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dockerfiles/core/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down