diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md new file mode 100644 index 0000000000000000000000000000000000000000..57d75703bd69fde1a824122c2c417fee657d7617 --- /dev/null +++ b/DEPLOYMENT.md @@ -0,0 +1,22 @@ +# Step by Step deployment guide + +- [ ] Make sure that the master branch is clean and all commits are pushed to origin +- [ ] `git checkout stable` +- [ ] `git merge --no-ff master` +- [ ] 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 merge --no-ff stable` +- [ ] Change the version number and the registry branch of the images in all deployment yaml files +- [ ] `git add kubernetes/*deploy*yaml` +- [ ] `git commit` +- [ ] `git tag -a $VERSION_NUMBER -s -u $GPG_ID_HASH` +- [ ] `git push --all +- [ ] `git push --tags` +- [ ] `cd dockerfiles` +- [ ] `./release $VERSION_NUMBER production` +- [ ] `cd ../kubernetes` +- [ ] `./stop_kube.sh` +- [ ] `./start_kube.sh` +- [ ] `git checkout master` diff --git a/dockerfiles/commul-customization/default-ssl b/dockerfiles/commul-customization/default-ssl index a22fada3c4a5993e81226f0e4189604174147fae..cc58810b8116fc1198c43f25ff5a1da4d99551bb 100644 --- a/dockerfiles/commul-customization/default-ssl +++ b/dockerfiles/commul-customization/default-ssl @@ -63,7 +63,7 @@ server { rewrite ^/repository/oai/?$ $oai_index permanent; # 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; } diff --git a/dockerfiles/commul-customization/local.properties b/dockerfiles/commul-customization/local.properties index 907783dd399b768f176633b717c0927143d64d52..e98083714e3c8662b0c8f46c6af3167d87f6015a 100644 --- a/dockerfiles/commul-customization/local.properties +++ b/dockerfiles/commul-customization/local.properties @@ -298,8 +298,8 @@ lr.xmlui.user.showlanguage = false ############################################### # oai #mind the documentation for oai/cite and the respective apache rewrite -lr.repository.identifier = clarin.eurac.edu -lr.repository.sampleIdentifier = oai:clarin.eurac-dev.edu:11858/00-097C-0000-0001-487A-4 +lr.repository.identifier = clarin.eurac.edu +lr.repository.sampleIdentifier = oai:clarin.eurac.edu:20.500.12124/3 #### # diff --git a/dockerfiles/commul-customization/shibboleth_sp_with_fastcgi.sh b/dockerfiles/commul-customization/shibboleth_sp_with_fastcgi.sh index 52c57b777eee439249c83eea3bbe9a527fcb5957..6d717e8a56e05c4685c221be5a8bbc935d217d9f 100644 --- a/dockerfiles/commul-customization/shibboleth_sp_with_fastcgi.sh +++ b/dockerfiles/commul-customization/shibboleth_sp_with_fastcgi.sh @@ -22,7 +22,7 @@ function get { } 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 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/ diff --git a/kubernetes/dspace-deployment.yaml b/kubernetes/dspace-deployment.yaml index 09cc7f20683eaa9ed6add3f697749ce62fe78964..1239204852fb1d48903133a30215c1f128e1cb7b 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/production/dspace:1.3 + image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/dspace:1.3.1 name: clarin-dspace imagePullPolicy: Always ports: diff --git a/kubernetes/nginx-deployment.yaml b/kubernetes/nginx-deployment.yaml index a60ddf6da6bceb0e619c4feca245f6001ff35f23..5182b15c68eba4d699cf4f3474e3a8853428118a 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/production/nginx:1.3 + - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/nginx:1.3.1 imagePullPolicy: Always name: clarin-nginx ports: diff --git a/kubernetes/postgres-deployment.yaml b/kubernetes/postgres-deployment.yaml index 824259f8205e7977a010ad1d932b2b4a0e8991ff..d42c09ebcba8d076af4fb83532e156ebca59c227 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/production/postgres:1.3 + image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/postgres:1.3.1 imagePullPolicy: Always name: clarin-postgres resources: {}