Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • commul/docker/clarin-dspace
1 result
Show changes
Commits on Source (62)
...@@ -12,6 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -12,6 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed ### Removed
### Fixed ### Fixed
## [1.3.1] - 2019-02-25
### Fixed
- oai sample identifier is now pointing to an existing record
- fixed typo to make content negotiation work for application/x-cmdi+xml
- fixed get URL for xerces
- IdP metadata from CLARIN are now downloaded during Docker build and not only once the container is running
## [1.3] - 2018-09-05 ## [1.3] - 2018-09-05
### Added ### Added
...@@ -79,8 +88,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -79,8 +88,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
This is the first release. It all starts here. This is the first release. It all starts here.
[Unreleased]:https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.1...HEAD [Unreleased]:https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.3.1...HEAD
[1.1]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.0...v1.1 [1.3.1]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.3...v1.3.1
[1.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.1...v1.2
[1.2.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.2...v1.2.2
[1.3]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.2.2...v1.3 [1.3]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.2.2...v1.3
[1.2.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.2...v1.2.2
[1.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.1...v1.2
[1.1]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.0...v1.1
# Step by Step deployment guide
- [ ] Edit CHANGELOG.md and add a new section for the upcoming release
- [ ] Commit to master to make sure that the master branch is clean and all commits are pushed to origin
- [ ] `git checkout stable`
- [ ] `git merge --no-ff master`
- [ ] (Optional) You can now deploy stable to kommul-dev (`./release.sh $VERSION_NUMBER-RC-$RCNUMBER`)
- [ ] Make sure that the stable branch is clean and all commits are pushed to origin
- [ ] `git checkout production`
- [ ] `git checkout $HASHID -- .`
The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed)
- [ ] `git checkout -b v1.3-$VERSION_NUMBER`
- [ ] `git merge --no-ff stable`
- [ ] resolve conflicts 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 push --tags`
- [ ] `cd dockerfiles`
- [ ] `./release.sh $VERSION_NUMBER production`
- [ ] `cd ../kubernetes`
- [ ] `./stop_kube.sh`
- [ ] `./start_kube.sh`
- [ ] `git checkout master`
...@@ -63,7 +63,7 @@ server { ...@@ -63,7 +63,7 @@ server {
rewrite ^/repository/oai/?$ $oai_index permanent; rewrite ^/repository/oai/?$ $oai_index permanent;
# kept 'redirect' to be sure that this keeps working # kept 'redirect' to be sure that this keeps working
if ($http_accept ~ "(.*xml.cmdi.*)"){ if ($http_accept ~ "(.*cmdi.xml.*)"){
rewrite ^/(.*)/xmlui/handle/(.*)$ https://$http_host/repository/oai/cite?metadataPrefix=cmdi&handle=$2? redirect; rewrite ^/(.*)/xmlui/handle/(.*)$ https://$http_host/repository/oai/cite?metadataPrefix=cmdi&handle=$2? redirect;
} }
......
...@@ -298,8 +298,8 @@ lr.xmlui.user.showlanguage = false ...@@ -298,8 +298,8 @@ lr.xmlui.user.showlanguage = false
############################################### ###############################################
# oai # oai
#mind the documentation for oai/cite and the respective apache rewrite #mind the documentation for oai/cite and the respective apache rewrite
lr.repository.identifier = clarin.eurac.edu lr.repository.identifier = clarin.eurac.edu
lr.repository.sampleIdentifier = oai:clarin.eurac-dev.edu:11858/00-097C-0000-0001-487A-4 lr.repository.sampleIdentifier = oai:clarin.eurac.edu:20.500.12124/3
#### ####
# #
......
...@@ -22,7 +22,7 @@ function get { ...@@ -22,7 +22,7 @@ function get {
} }
get log4shib 1.0.9 http://shibboleth.net/downloads/log4shib/1.0.9/ get log4shib 1.0.9 http://shibboleth.net/downloads/log4shib/1.0.9/
get xerces-c 3.2.1 http://mirror.hosting90.cz/apache/xerces/c/3/sources/ get xerces-c 3.2.2 https://archive.apache.org/dist/xerces/c/3/sources/
get xml-security-c 1.7.3 https://archive.apache.org/dist/santuario/c-library/ get xml-security-c 1.7.3 https://archive.apache.org/dist/santuario/c-library/
get xmltooling 1.6.4 http://shibboleth.net/downloads/c++-opensaml/2.6.1/ get xmltooling 1.6.4 http://shibboleth.net/downloads/c++-opensaml/2.6.1/
get opensaml 2.6.1 http://shibboleth.net/downloads/c++-opensaml/2.6.1/ get opensaml 2.6.1 http://shibboleth.net/downloads/c++-opensaml/2.6.1/
......
...@@ -50,7 +50,7 @@ spec: ...@@ -50,7 +50,7 @@ spec:
secretKeyRef: secretKeyRef:
key: mail.pass key: mail.pass
name: dspace-secrets name: dspace-secrets
image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/dspace:1.3 image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/dspace:1.3.1
name: clarin-dspace name: clarin-dspace
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
......
...@@ -20,7 +20,7 @@ spec: ...@@ -20,7 +20,7 @@ spec:
io.kompose.service: nginx io.kompose.service: nginx
spec: spec:
containers: containers:
- image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/nginx:1.3 - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/nginx:1.3.1
imagePullPolicy: Always imagePullPolicy: Always
name: clarin-nginx name: clarin-nginx
ports: ports:
......
...@@ -48,7 +48,7 @@ spec: ...@@ -48,7 +48,7 @@ spec:
secretKeyRef: secretKeyRef:
key: dspace.utils.name key: dspace.utils.name
name: dspace-secrets name: dspace-secrets
image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/postgres:1.3 image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/postgres:1.3.1
imagePullPolicy: Always imagePullPolicy: Always
name: clarin-postgres name: clarin-postgres
resources: {} resources: {}
......