Skip to content

dockerfiles: replace wait-for-it dependency with simple bash loop #1366

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

Merged
merged 1 commit into from
Apr 17, 2024
Merged

dockerfiles: replace wait-for-it dependency with simple bash loop #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ RUN set -e ;\
apt install -q=2 --yes --no-install-recommends python3 python3-dev python3-pip python3-setuptools git build-essential libsnappy-dev ;\
pip3 install --break-system-packages -U pip;\
apt clean ;\
rm -rf /var/lib/apt/lists/* ;\
git clone https://github.com/vishnubob/wait-for-it.git opt/wait-for-it && cd opt/wait-for-it && git reset --hard 54d1f0bfeb6557adf8a3204455389d0901652242
rm -rf /var/lib/apt/lists/*

#
# Client
Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/staging/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ services:
stdin_open: true
network_mode: "host"
tmpfs: "/tmp"
# Use wait-for-it to ensure exporter service is up, as exporter is assuming exporter to
# Wait until coordinator is up
# Use labgrid-client r to ensure the exporter has populated the resource list in the coordinator
# Use sleep to fix the problem that sometimes the coordinator is not ready even though the service is up
command: timeout 60 bash -c "set -e &&
cd /simple-test &&
/opt/wait-for-it/wait-for-it.sh 127.0.0.1:20408 &&
until echo > /dev/tcp/localhost/20408; do sleep 1; done &&
sleep 5 &&
while [ -z $$(/usr/local/bin/labgrid-client r) ]; do echo 'Wait one sec on coordinator' && sleep 1; done &&
/usr/local/bin/labgrid-client -p example-place lock &&
Expand All @@ -43,7 +43,7 @@ services:
network_mode: "host"
stdin_open: true
command: bash -c "set -e &&
/opt/wait-for-it/wait-for-it.sh 127.0.0.1:20408 -- labgrid-exporter /opt/conf/exporter.yaml"
until echo > /dev/tcp/localhost/20408; do sleep 1; done && labgrid-exporter /opt/conf/exporter.yaml"
dut:
build:
context: "./dut"
Expand Down