Merge branch 'v1.3.2' into production

CHANGELOG.md

@@ -12,6 +12,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Fixed
 
+## [1.3.2] - 2019-06-27
+
+### Added
+
+- added liveness probes for DSpace and nginx pods (#53)
+- added DSpace cronjobs to generate statistics, solr index etc. (#48)
+
+### Changed
+
+- upgraded DSpace to 2019.01 (#56)
+
 ## [1.3.1] - 2019-02-25
 
 ### Fixed
@@ -88,7 +99,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.1...HEAD
+[Unreleased]:https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.3.2...HEAD
+[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
 [1.2.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.2...v1.2.2

DEPLOYMENT.md

@@ -4,12 +4,11 @@
 - [ ] 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`)
+- [ ] (Optional) You can now deploy stable to dspace-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 -- .`
+- [ ] `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 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

clarin-dev2clarin.sh

@@ -25,4 +25,4 @@ echo "Modified all files to point to clarin.eurac.edu instead of clarin-dev.eura
 
 # adapt namespace in kubernetes yaml files
 sed -i 's/dspace-dev/dspace/' kubernetes/*.yaml
-perl -pi -e 's/clarin-dev/clarin/g' kubernetes/dspace-ingress.yaml
+perl -pi -e 's/clarin-dev/clarin/g' kubernetes/{dspace-ingress,dspace-deployment,nginx-deployment}.yaml

dockerfiles/Dockerfile.dspace

@@ -86,7 +86,9 @@ RUN make new_deploy
 
 # DEBUG: to be able to access tomcat manager through browser
 # COPY commul-customization/tomcat-users.xml /opt/tomcat8/conf/
+# adapt some config files
 RUN perl -pi -e 's/#useProxies = true/useProxies = true/' /opt/lindat-dspace/installation/config/dspace.cfg
+RUN perl -pi -e 's#    (?s).*org.apache.catalina.connector.ClientAbortException: java.io.IOException: Broken pipe.*#    (?s).*org.apache.catalina.connector.ClientAbortException: java.io.IOException: Broken pipe.*,\\\n    (?s).*user-agent=.kube-probe.*#' /opt/lindat-dspace/installation/config/modules/lr.cfg
 
 # set up handle server
 COPY commul-customization/hdl-setup.tmp /tmp/

dockerfiles/commul-customization/entrypoint.sh

-#!/bin/sh
+#!/bin/bash
 
 # replace environment variables in config files
 perl -pi -e 's/\$\{DSPACE_USER\}/$ENV{DSPACE_USER}/; s/\$\{DSPACE_PASSWORD\}/$ENV{DSPACE_PASSWORD}/; s/\$\{MAIL_USER\}/$ENV{MAIL_USER}/; s/\$\{MAIL_PASSWORD\}/$ENV{MAIL_PASSWORD}/; s/\$\{DSPACE_DBNAME\}/$ENV{DSPACE_DBNAME}/; s/\$\{DSPACE_UTILSDBNAME\}/$ENV{DSPACE_UTILSDBNAME}/;' /opt/repository/sources/dspace/local.properties
@@ -16,9 +16,32 @@ perl -pi -e 's/\$\{HANDLE_USER\}/$ENV{HANDLE_USER}/; s/\$\{HANDLE_PASSWORD\}/$EN
 /opt/tomcat8/bin/startup.sh
 cd /opt/repository/workspace/scripts
 make init_statistics
-make update_discovery
-make update_oai
-/opt/lindat-dspace/installation/bin/dspace generate-sitemaps
+
+# 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
+    echo "INIT DONE."
+    sleep 86400
+done)
+
+# Read the output of the process line by line until one line contains Ready
+while read line; do
+   case "$line" in
+   "INIT DONE.")
+      break
+      ;;
+   esac
+done <&3
+
+# Close the file descriptor
+exec <&3 3<&-
 /opt/tomcat8/bin/shutdown.sh -force
 
 # start tomcat

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.1
+        image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/dspace:1.3.2
         name: clarin-dspace
         imagePullPolicy: Always
         ports:
@@ -62,6 +62,15 @@ spec:
         volumeMounts:
         - mountPath: /opt/lindat-dspace/installation/assetstore
           name: dspace-assetstore
+        livenessProbe:
+          httpGet:
+            host: clarin.eurac.edu
+            path: /repository/xmlui/
+            port: 443
+            scheme: HTTPS
+          initialDelaySeconds: 600
+          periodSeconds: 15
+          timeoutSeconds: 3
       restartPolicy: Always
       imagePullSecrets:
         - name: gitlab-scientificnet-org-registry

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.1
+      - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/nginx:1.3.2
         imagePullPolicy: Always
         name: clarin-nginx
         ports:
@@ -32,6 +32,14 @@ spec:
           name: nginx-shib-certs
         - mountPath: /etc/ssl/clarin
           name: nginx-ssl-certs
+        livenessProbe:
+          httpGet:
+            host: clarin.eurac.edu
+            port: 443
+            scheme: HTTPS
+          initialDelaySeconds: 30
+          periodSeconds: 15
+          timeoutSeconds: 3
       restartPolicy: Always
       imagePullSecrets:
         - name: gitlab-scientificnet-org-registry

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.1
+        image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/postgres:1.3.2
         imagePullPolicy: Always
         name: clarin-postgres
         resources: {}