Merge remote-tracking branch 'origin/develop' into staging

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2024-12-08 13:11:43 +07:00
commit af16c71f80
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2
3 changed files with 11 additions and 11 deletions

View File

@ -11,15 +11,15 @@ then
version="${a[0]}.${a[1]}.${c}-staging"
echo "Tagging staging $1 with version ${version}"
docker tag "$1:$rev_version" "$1:$version"
for n in {1..5}; do
for n in {1..25}; do
docker push "$1:$version" && break
if (( $n < 5 ))
if (( $n < 25 ))
then
echo 'Docker failed to push, wait 5 second'
sleep 5
else
echo '5 push attempts failed, exiting with failure'
echo '25 push attempts failed, exiting with failure'
exit 1
fi
done
@ -27,27 +27,27 @@ else
echo "Tagging release $1 with version ${version}"
docker tag "$1:$rev_version" "$1:$version"
docker tag "$1:$rev_version" "$1:latest"
for n in {1..5}; do
for n in {1..25}; do
docker push "$1:$version" && break
if (( $n < 5 ))
if (( $n < 25 ))
then
echo 'Docker failed to push, wait 5 second'
sleep 5
else
echo '5 push attempts failed, exiting with failure'
echo '25 push attempts failed, exiting with failure'
exit 1
fi
done
for n in {1..5}; do
for n in {1..25}; do
docker push "$1:latest" && break
if (( $n < 5 ))
if (( $n < 25 ))
then
echo 'Docker failed to push, wait 5 second'
sleep 5
else
echo '5 push attempts failed, exiting with failure'
echo '25 push attempts failed, exiting with failure'
exit 1
fi
done

View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash
echo "Tagging release $1 with version $2"
docker tag "$1" "$1:$2"
for n in {1..5}; do
for n in {1..25}; do
docker push "$1:$2" && break
echo 'Docker failed to push, wait 5 seconds'
sleep 5

View File

@ -8,7 +8,7 @@ trap "exit" INT
mkdir -p ${dump}
mkdir -p ${dump}/workspaces
get_dbs="db.getSiblingDB('account').getCollection('workspace').find({lastVisit: {\$gt: Date.now() - ($DAYS * 24 * 60 * 60 * 1000)}}).forEach(it=>console.log(it.workspace, it.lastVisit))"
get_dbs="db.getSiblingDB('account').getCollection('workspace').find({ disabled: {\$ne:true}, mode: 'active', lastVisit: {\$gt: Date.now() - ($DAYS * 24 * 60 * 60 * 1000)}}).forEach(it=>console.log(it.workspace, it.lastVisit))"
mongosh --version
mongosh ${MONGO_URL} --eval "$get_dbs" > ${dump}/databases.list