From a8aec1143c78a9d7cf23029766c0329023b1bf55 Mon Sep 17 00:00:00 2001 From: pedro Date: Fri, 8 Mar 2024 10:09:43 +0100 Subject: [PATCH] idhub entrypoint: inject DOMAIN env var in status also adapt accordingly status.sh script --- docker/idhub.entrypoint.sh | 4 ++++ status.sh | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docker/idhub.entrypoint.sh b/docker/idhub.entrypoint.sh index 9aa4b6d..10b9328 100755 --- a/docker/idhub.entrypoint.sh +++ b/docker/idhub.entrypoint.sh @@ -19,6 +19,10 @@ inject_env_vars() { # related https://www.kenmuse.com/blog/avoiding-dubious-ownership-in-dev-containers/ git config --global --add safe.directory "${idhub_dir}" export COMMIT="commit: $(git log --pretty=format:'%h' -n 1)" + + cat > status_data </dev/null d_name="$(basename "${d}")" } @@ -26,7 +28,7 @@ main() { | cut -d'_' -f3 \ | sort -u )" - _git_info ./ssikit_trustchain + _dir_info ./ssikit_trustchain printf -- "%-36s | branch: %-8s | commit: %s\n" "${d_name}" "${branch_info}" "${commit_info}" printf -- " note: outdated ssikit_trustchain version could be present on any instance. Hence, this is only relevant for new or fresh builds\n\n" for i in ${instances}; do @@ -36,8 +38,9 @@ main() { )" echo "- ${i}" for d in ${dirs}; do - _git_info "${d}" - printf -- " - %-30s | branch: %-8s | commit: %s\n" "${d_name}" "${branch_info}" "${commit_info}" + _dir_info "${d}" + printf -- " - %-35s | dir: %-30s | branch: %-8s | commit: %s\n" "${DOMAIN:-unknown domain}" "${d_name}" "${branch_info}" "${commit_info}" + unset DOMAIN done done printf '\n\n$ docker ps\n\n'