From e8cd68c72233e3b46b92ca9dabc4cb4929185d27 Mon Sep 17 00:00:00 2001 From: Benoit Date: Thu, 24 Oct 2024 18:20:15 +0900 Subject: [PATCH] Add helper script wait_network --- cfg/jobs/forgejo.run | 3 +-- cfg/jobs/mastodon.run | 3 +-- cfg/jobs/navidrome.run | 3 +-- cfg/scripts/wait_network | 6 ++++++ 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 cfg/scripts/wait_network diff --git a/cfg/jobs/forgejo.run b/cfg/jobs/forgejo.run index 8d28030..f04ab42 100755 --- a/cfg/jobs/forgejo.run +++ b/cfg/jobs/forgejo.run @@ -17,8 +17,7 @@ ALIAS="$UPSTREAM_NAME-$UPSTREAM_VER-$SERIAL" cd $WORKSPACE incus launch images:$IMAGE $CNAME --quiet -# Wait for network -timeout 30 bash -c "until incus exec $CNAME -- ping -c1 google.com &>/dev/null; do sleep 1; done" +wait_network $CNAME # Forgejo incus exec $CNAME -- mkdir /etc/esh diff --git a/cfg/jobs/mastodon.run b/cfg/jobs/mastodon.run index 913689f..00c5253 100755 --- a/cfg/jobs/mastodon.run +++ b/cfg/jobs/mastodon.run @@ -17,8 +17,7 @@ ALIAS="$UPSTREAM_NAME-$UPSTREAM_VER-$SERIAL" cd "$WORKSPACE" incus launch images:$IMAGE "$CNAME" --quiet -# Wait for network -timeout 30 bash -c "until incus exec $CNAME -- ping -c1 google.com &>/dev/null; do sleep 1; done" +wait_network $CNAME # Mastodon incus exec "$CNAME" -- bash -c ' diff --git a/cfg/jobs/navidrome.run b/cfg/jobs/navidrome.run index 8b25b1b..7258d28 100755 --- a/cfg/jobs/navidrome.run +++ b/cfg/jobs/navidrome.run @@ -17,8 +17,7 @@ ALIAS="$UPSTREAM_NAME-$UPSTREAM_VER-$SERIAL" cd $WORKSPACE incus launch images:$IMAGE $CNAME --quiet -# Wait network -sleep 5 +wait_network $CNAME # Navidrome incus exec $CNAME -- mkdir /etc/esh diff --git a/cfg/scripts/wait_network b/cfg/scripts/wait_network new file mode 100644 index 0000000..a31f043 --- /dev/null +++ b/cfg/scripts/wait_network @@ -0,0 +1,6 @@ +#!/bin/env bash +# Upstream doc: https://www.navidrome.org/docs/installation/linux/ +set -euxo pipefail + +CNAME="$1" +timeout 30 bash -c "until incus exec $CNAME -- ping -c1 google.com &>/dev/null; do sleep 1; done"