From f27aa8b284ee8a9090571b1afcbb716bf4fa9a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <40151420+ldericher@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:28:03 +0100 Subject: [PATCH] add compose_version to `check_version` --- deploy/chores/check_version | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/deploy/chores/check_version b/deploy/chores/check_version index 2bca03b..4560974 100755 --- a/deploy/chores/check_version +++ b/deploy/chores/check_version @@ -23,14 +23,21 @@ install_version="$( \ | sed -E 's/^ovd_version[^0-9]*((0|[1-9][0-9]*)[0-9\.]*[0-9]).*$/\1/' )" +compose_version="$( \ + grep 'image: code\.yavook\.de/oekzident\.de/ovdashboard' "${script_dir}/../docker-compose.yml" \ + | sed -E 's/.*code\.yavook\.de\/oekzident\.de\/ovdashboard[^0-9]*((0|[1-9][0-9]*)[0-9\.]*[0-9]).*$/\1/' +)" + if [ "${git_version}" = "${api_version}" ] \ && [ "${git_version}" = "${ui_version}" ] \ -&& [ "${git_version}" = "${install_version}" ]; then +&& [ "${git_version}" = "${install_version}" ] \ +&& [ "${git_version}" = "${compose_version}" ]; then mark="✅️" else mark="❌️" fi -echo "git: ${git_version}, api: ${api_version}, ui: ${ui_version}, installer: ${install_version} ${mark}" +echo "git: ${git_version}, api: ${api_version}, ui: ${ui_version}" +echo "installer: ${install_version}, compose: ${compose_version} => ${mark}" [ "${mark}" = "✅️" ] || exit 1