diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f7af8717c71e5c2fd41fdd044c603bd5b4de291..854fdb923570f242cae0d960ca0528095d074bc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Fixed +## [1.3.3] - 2019-07-23 + +### Changed + +- adapted healthcheck "cronjob" to force exit in case it hangs for some reason (#60) + ## [1.3.2] - 2019-06-27 ### Added @@ -99,7 +105,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 This is the first release. It all starts here. -[Unreleased]:https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.3.2...HEAD +[Unreleased]:https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.3.3...HEAD +[1.3.3]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.3.2...v1.3.3 [1.3.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.3.1...v1.3.2 [1.3.1]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.3...v1.3.1 [1.3]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.2.2...v1.3 diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md index c58e30c86b8d28f8fd2cf25a76abf155782a8a89..448338d1a619a8b1a184a111fc4971bc6cff05b1 100644 --- a/DEPLOYMENT.md +++ b/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` diff --git a/dockerfiles/commul-customization/entrypoint.sh b/dockerfiles/commul-customization/entrypoint.sh index fe0ca4601cd017ac0f5e73d291b9a78ac53a44f2..5587f7922e045309870d91146a866b17ac64d5c4 100644 --- a/dockerfiles/commul-customization/entrypoint.sh +++ b/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) diff --git a/kubernetes/dspace-deployment.yaml b/kubernetes/dspace-deployment.yaml index 7811e75ee1dbd67f03892266926577e3ac24229a..557f890cfeb406e2053a9b574fa6fde0e8b6ba99 100644 --- a/kubernetes/dspace-deployment.yaml +++ b/kubernetes/dspace-deployment.yaml @@ -50,7 +50,7 @@ spec: secretKeyRef: key: mail.pass name: dspace-secrets - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/dspace:1.3.2-RC1 + image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/dspace:1.3.3-RC1 name: clarin-dspace imagePullPolicy: Always ports: diff --git a/kubernetes/nginx-deployment.yaml b/kubernetes/nginx-deployment.yaml index 4a7fd7603011e0e4a643fe1d145291b16ab74ab9..b5b4510a81be9be0d4ed08b6c9c1eda7487e7623 100644 --- a/kubernetes/nginx-deployment.yaml +++ b/kubernetes/nginx-deployment.yaml @@ -20,7 +20,7 @@ spec: io.kompose.service: nginx spec: containers: - - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/nginx:1.3.2-RC1 + - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/nginx:1.3.3-RC1 imagePullPolicy: Always name: clarin-nginx ports: diff --git a/kubernetes/postgres-deployment.yaml b/kubernetes/postgres-deployment.yaml index 9f4d7fe1859ff98dd6515679be2d24332794275a..6f0c487eb413f27c979326399cfe6fe6c923b0aa 100644 --- a/kubernetes/postgres-deployment.yaml +++ b/kubernetes/postgres-deployment.yaml @@ -48,7 +48,7 @@ spec: secretKeyRef: key: dspace.utils.name name: dspace-secrets - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/postgres:1.3.2-RC1 + image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/postgres:1.3.3-RC1 imagePullPolicy: Always name: clarin-postgres resources: {}