Merge branch 'master' into stable

DEPLOYMENT.md

@@ -10,15 +10,16 @@
 - [ ] `git checkout -b v$VERSION_NUMBER $HASHID -- .`
       The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed)
 - [ ] `git merge --no-ff stable`
-- [ ] resolve conflicts and commit
+- [ ] resolve conflicts (though there shouldn't be any) and commit
 - [ ] Change the version number and the registry branch of the images in all deployment yaml files
 - [ ] Run the clarindev2clarin.sh script
 - [ ] `git commit -a `
 - [ ] `git checkout production`
 - [ ] `git merge v1.3-$VERSION_NUMBER`
 - [ ] resolve conflicts and commit
-- [ ] `git tag -a $VERSION_NUMBER -s -u $GPG_ID_HASH`
-- [ ] `git push --all
+- [ ] `git tag -a $VERSION_NUMBER -s (-u $GPG_ID_HASH)` defaults to your default GPG key
+- [ ] `git branch -d $VERSION_NUMBER`
+- [ ] `git push --all`
 - [ ] `git push --tags`
 - [ ] `cd dockerfiles`
 - [ ] `./release.sh $VERSION_NUMBER production`

dockerfiles/commul-customization/entrypoint.sh

@@ -20,13 +20,13 @@ make init_statistics
 # https://ubuntuforums.org/showthread.php?t=979694
 # Start process in the background and send its output to file descriptor 3
 exec 3< <(while (true); do
-    make update_oai
-    make update_statistics
-    make update_sitemap
-    make lift_embargos
-    make update_openaire_cache
-    make update_discovery
-    make send_info
+    timeout -k 30 300 make update_oai
+    timeout -k 30 300 make update_statistics
+    timeout -k 30 300 make update_sitemap
+    timeout -k 30 300 make lift_embargos
+    timeout -k 30 300 make update_openaire_cache
+    timeout -k 30 300 make update_discovery
+    timeout -k 30 300 make send_info
     echo "INIT DONE."
     sleep 86400
 done)