# HG changeset patch
# User Marc Davis <marc.davis@mcoecn.org>
# Date 1706630115 18000
# Node ID c941bcc97e5b877d7a9683435ffd8eecc6830a1a
# Parent  cb672d0888c629790dac2a8066fd93c38cf00484# Parent  11593e9300f2a09c09d03b67a736462790e32961
flow: Merged <hotfix> '2.16.1' to <develop> ('default').

diff -r cb672d0888c6 -r c941bcc97e5b .hgtags
--- a/.hgtags	Wed Nov 08 09:49:17 2023 -0500
+++ b/.hgtags	Tue Jan 30 10:55:15 2024 -0500
@@ -15,3 +15,18 @@
 7441285bf3260df13dd32eef7368884852fce59a v2.0.1
 3754be907d9be60edd6e0afcb478485a5b4f4d27 vv2.1.0
 0032d099a2d5033819cbe463e59956317c3e36ca v2.2.0
+6b56c854199ccf1f6939ad2c211648d635fe732f v2.2.1
+d41836720ce4ded3d3bd099241d10cc4dd57a173 v2.3.0
+95d7d70f34a5cd36548c5b5e58e6137b731fe230 v2.4.0
+15d0cffd99801a905f5a6e63d1b1a86a5222cbd8 v2.5.0
+b35f4af06ed4a931b3418b9fe2adaa7dcb1672b5 vv2.6.0
+9735d4fef9c5c07c557b52b9572b773136b76e90 v2.7.0
+180476e1555bccd80b4035e73ef303075b29a922 v2.8.1
+5c15261647e017b735872d6fbd641310811abd1b v2.8.2
+50e99c5b33afaf565f9de0286b2c101e2d08ae84 vv2.9.0
+b371970462c3f2362361873a4a55c99d7021f50b v2.10.0
+c4152baa09b34acc54c3e214256101267f99a7a7 vv2.11.0
+3c0d82dcd168bec77c8eb5eac5580d018dbd3d24 vv2.12.0
+3508fd2d323a45dd1b341be3f45086b6325fcd4e 2.14.0
+4b0c2c7e213b8cbc9d06a8ca84e97bc3ea37f5ad v2.15.0
+5b027b3e5c8ed886430f1aa9b84afb075d5f0f9e 2.16.0
diff -r cb672d0888c6 -r c941bcc97e5b scripts/backup-container-docker.sh
--- a/scripts/backup-container-docker.sh	Wed Nov 08 09:49:17 2023 -0500
+++ b/scripts/backup-container-docker.sh	Tue Jan 30 10:55:15 2024 -0500
@@ -47,6 +47,17 @@
    echo "container name is $containerName"
 fi
 
+if [[ "$container" = "itcmdb" && -f ".env/itcm-shared.properties" ]]; then
+   function prop {
+       grep "${1}" .env/itcm-shared.properties|cut -d'=' -f2
+   }
+   entityId=$(prop 'entityId' | tr -d '"')
+   containerName="$entityId-itcm-db"
+   backupFile=./backup/${entityId}-itcm-db.$(date +%Y-%m-%d-%H-%M-%S).backup
+   echo "entityId is $entityId"
+   echo "container name is $containerName"
+fi
+
 if [ ! -z "$containerName" ]; then
    echo "Container is $container"
    if [ "$container" = "invdb" ]; then