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

…ase/8.3
edu-sharing · May 23, 2024 · 48505d8 · 48505d8
2 parents 4d3657d + 19e0037
commit 48505d8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/archetypes/helm/src/main/resources/archetype-resources/deploy.sh b/archetypes/helm/src/main/resources/archetype-resources/deploy.sh
@@ -4,11 +4,19 @@ set -o pipefail
 
 if [[ -z $1 ]] ; then
   echo ""
-  echo "deploy.sh <release> <chart> [<version|path>]"
+  echo "deploy.sh [-s skip checks and deploy directly] <release> <chart> [<version|path>]"
   echo ""
   exit 0
 fi
 
+SKIP=false
+while getopts s: opt; do
+    case $opt in
+        s) SKIP=true
+    esac
+    shift
+done
+
 RELEASE=${1?"release required"}
 CHART=${2?"chart required"}
 VERSION=${3:-"":->=0.0.0-0}
@@ -84,6 +92,7 @@ fi
 
 popd >/dev/null || exit
 
+if [ "$SKIP" = false ] ; then
 echo ""
 echo "--------------------------------------------------------------------------------"
 echo ""
@@ -182,6 +191,7 @@ case ${answer:0:1} in
     ;;
 esac
 
+fi
 echo ""
 echo "--------------------------------------------------------------------------------"
 echo ""

diff --git a/...rces/archetype-resources/deploy/docker/repository/build/service/src/main/build/Dockerfile b/...rces/archetype-resources/deploy/docker/repository/build/service/src/main/build/Dockerfile
@@ -230,6 +230,11 @@ 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

diff --git a/...deploy/docker/services/rendering/helm/service/src/main/chart/templates/configmap-env.yaml b/...deploy/docker/services/rendering/helm/service/src/main/chart/templates/configmap-env.yaml
@@ -15,6 +15,7 @@ data:
   SERVICES_RENDERING_DATABASE_HOST: {{ .Values.config.database.host | quote }}
   SERVICES_RENDERING_DATABASE_NAME: {{ .Values.config.database.database | quote }}
   SERVICES_RENDERING_DATABASE_PORT: {{ .Values.config.database.port | quote }}
+  SERVICES_RENDERING_SERVICE_CACHE_CLEANER_USE_DISK_SIZE: {{ .Values.job.cachecleaner.config.useDiskSize | quote }}
   SERVICES_RENDERING_SERVICE_GDPR_ENABLED: {{ .Values.config.gdpr.enabled | quote }}
   {{- with .Values.config.gdpr.modules }}
   SERVICES_RENDERING_SERVICE_GDPR_MODULES: '{{- join "," . }}'

diff --git a/...hetype-resources/deploy/docker/services/rendering/helm/service/src/main/chart/values.yaml b/...hetype-resources/deploy/docker/services/rendering/helm/service/src/main/chart/values.yaml
@@ -329,6 +329,9 @@ job:
 
   cachecleaner:
 
+    config:
+      useDiskSize: true
+
     podAnnotations: {}
 
     resources: