Merge remote-tracking branch 'origin/maven/fixes/8.3' into maven/rele…

…ase/8.3

archetypes/project/src/main/resources/archetype-resources/deploy/docker/repository/build/service/src/main/build/Dockerfile

@@ -230,11 +230,6 @@ COPY --chown=worker:worker assets/profiler profiler/
 
 ########################################################################################################################
 
-RUN set -eux \
-    && chmod -R o+w /opt/bitnami/tomcat/conf /opt/bitnami/tomcat/lib /opt/bitnami/tomcat/logs /opt/bitnami/tomcat/temp /opt/bitnami/tomcat/webapps /opt/bitnami/tomcat/work
-
-########################################################################################################################
-
 USER worker
 
 EXPOSE 8009 8080 8081

archetypes/project/src/main/resources/archetype-resources/deploy/docker/repository/compose/src/main/compose/1_repository-common.yml

@@ -139,6 +139,7 @@ services:
       - "repository-service-volume-config-cluster:/opt/bitnami/tomcat/shared/classes/config/cluster"
       - "repository-service-volume-config-node:/opt/bitnami/tomcat/shared/classes/config/node"
       - "repository-service-volume-data:/opt/alfresco/alf_data"
+      - "repository-service-volume-safe:/opt/alfresco/alf_safe"
     depends_on:
       - repository-database
       - repository-transform
@@ -155,3 +156,4 @@ volumes:
   repository-service-volume-config-cluster:
   repository-service-volume-config-node:
   repository-service-volume-data:
+  repository-service-volume-safe:

archetypes/project/src/main/resources/archetype-resources/deploy/docker/repository/helm/service/src/main/chart/templates/_helpers.tpl

@@ -36,6 +36,10 @@ share-config-{{ include "edusharing_repository_service.name" . }}
 share-data-{{ include "edusharing_repository_service.name" . }}
 {{- end -}}
 
+{{- define "edusharing_repository_service.pvc.share.safe" -}}
+share-safe-{{ include "edusharing_repository_service.name" . }}
+{{- end -}}
+
 {{- define "edusharing_repository_service.image" -}}
 {{- $registry := default .Values.global.image.registry .Values.image.registry -}}
 {{- $repository := default .Values.global.image.repository .Values.image.repository -}}

archetypes/project/src/main/resources/archetype-resources/deploy/docker/repository/helm/service/src/main/chart/templates/persistentvolumeclaim.yaml

@@ -19,3 +19,16 @@ metadata:
     "helm.sh/resource-policy": keep
 spec: {{ merge .Values.persistence.share.data.spec .Values.global.cluster.storage.share.spec | toYaml | nindent 2 }}
 {{- end }}
+{{- if .Values.persistence.share.safe.enabled }}
+{{- if .Values.persistence.share.safe.create }}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "edusharing_repository_service.pvc.share.safe" . }}
+  labels: {{ include "edusharing_repository_service.labels.app" . | nindent 4 }}
+  annotations:
+    "helm.sh/resource-policy": keep
+spec: {{ merge .Values.persistence.share.safe.spec .Values.global.cluster.storage.share.spec | toYaml | nindent 2 }}
+{{- end }}
+{{- end }}

archetypes/project/src/main/resources/archetype-resources/deploy/docker/repository/helm/service/src/main/chart/templates/statefulset.yaml

@@ -52,13 +52,22 @@ spec:
           if [[ ! "$(ls -A /opt/alfresco/alf_data)" ]]; then
             chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.podSecurityContext.fsGroup }} /opt/alfresco/alf_data
           fi
+          {{- if .Values.persistence.share.safe.enabled }}
+          if [[ ! "$(ls -A /opt/alfresco/alf_safe)" ]]; then
+            chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.podSecurityContext.fsGroup }} /opt/alfresco/alf_safe
+          fi
+          {{- end }}
         volumeMounts:
         - name: data
           mountPath: /opt/bitnami/tomcat/shared/classes/config/node
         - name: share-config
           mountPath: /opt/bitnami/tomcat/shared/classes/config/cluster
         - name: share-data
           mountPath: /opt/alfresco/alf_data
+        {{- if .Values.persistence.share.safe.enabled }}
+        - name: share-safe
+          mountPath: /opt/alfresco/alf_safe
+        {{- end }}
         {{- with .Values.init.permission.resources }}
         resources: {{ toYaml . | nindent 10 }}
         {{- end }}
@@ -108,6 +117,10 @@ spec:
           mountPath: /opt/bitnami/tomcat/shared/classes/config/cluster
         - name: share-data
           mountPath: /opt/alfresco/alf_data
+        {{- if .Values.persistence.share.safe.enabled }}
+        - name: share-safe
+          mountPath: /opt/alfresco/alf_safe
+        {{- end }}
         {{- with .Values.config.override.config.application.client }}
         - name: file
           mountPath: /opt/bitnami/tomcat/shared/classes/config/defaults/client.config.override.xml
@@ -364,6 +377,11 @@ spec:
       - name: share-data
         persistentVolumeClaim:
           claimName: {{ include "edusharing_repository_service.pvc.share.data" . }}
+      {{- if .Values.persistence.share.safe.enabled }}
+      - name: share-safe
+        persistentVolumeClaim:
+          claimName: {{ include "edusharing_repository_service.pvc.share.safe" . }}
+      {{- end }}
       - name: file
         configMap:
           name: {{ include "edusharing_repository_service.name" . }}-file

archetypes/project/src/main/resources/archetype-resources/deploy/docker/repository/helm/service/src/main/chart/values.yaml

@@ -336,6 +336,15 @@ persistence:
           requests:
             storage: 5Gi
 
+    safe:
+      enabled: false
+      create: true
+      spec:
+        accessModes: [ "ReadWriteMany" ]
+        resources:
+          requests:
+            storage: 5Gi
+
 ########################################################################################################################
 
 nodeAffinity: {}