🍒 Merge changes from PR #317 to release-v1.6.1

[ocrvs-bot]

Automated PR to merge changes from develop to release-v1.6.1

I failed to cherry-pick the changes automatically because of the following:

Auto-merging infrastructure/deployment/deploy.sh
[auto-pr-release-v1.6.1-317-17315 304ceb41] Docker prune is in deploy script, cron schedule is off
Author: Al hel md. shahriar zaman <[email protected]>
Date: Mon Nov 11 18:24:33 2024 +0600
2 files changed, 6 insertions(+), 8 deletions(-)
[auto-pr-release-v1.6.1-317-17315 28e29c5b] To ensure that this cron job is removed if it already exists
Author: Al hel md. shahriar zaman <[email protected]>
Date: Mon Nov 11 18:49:29 2024 +0600
1 file changed, 7 insertions(+)
Auto-merging infrastructure/deployment/deploy.sh
[auto-pr-release-v1.6.1-317-17315 28c5c228] Cleaning the docker images with sudo
Author: Al hel md. shahriar zaman <[email protected]>
Date: Mon Nov 11 19:41:56 2024 +0600
1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging infrastructure/deployment/deploy.sh
[auto-pr-release-v1.6.1-317-17315 3e79e0ca] Testing if the docker-prune.log file is created by ansible or not
Author: Al hel md. shahriar zaman <[email protected]>
Date: Tue Nov 12 12:46:40 2024 +0600
1 file changed, 2 insertions(+), 1 deletion(-)
Auto-merging infrastructure/deployment/deploy.sh
[auto-pr-release-v1.6.1-317-17315 f6942a37] Using sudo for log file
Author: Al hel md. shahriar zaman <[email protected]>
Date: Tue Nov 12 15:25:19 2024 +0600
1 file changed, 1 insertion(+), 2 deletions(-)
Auto-merging infrastructure/deployment/deploy.sh
[auto-pr-release-v1.6.1-317-17315 cdbba95d] Using sudo for log file(sudo removed from docker command)
Author: Al hel md. shahriar zaman <[email protected]>
Date: Tue Nov 12 15:53:07 2024 +0600
1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging infrastructure/deployment/deploy.sh
[auto-pr-release-v1.6.1-317-17315 becd3f70] Added a comment for better log readability
Author: Al hel md. shahriar zaman <[email protected]>
Date: Tue Nov 12 16:01:58 2024 +0600
1 file changed, 1 insertion(+)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply b5187914... Modified the changelog with new update

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.1-317-17315:auto-pr-release-v1.6.1-317-17315
git fetch origin clean-images-on-deploy:clean-images-on-deploy

git checkout auto-pr-release-v1.6.1-317-17315
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 6e2e4277 bdae2cad 5bb589a6 8d2cfd23 8c2b0196 7f3519ea cc63bb1a b5187914 807e3959