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

…ase/8.1
edu-sharing · Jan 9, 2024 · fc2e1c3 · fc2e1c3
2 parents 3a7e9c4 + d18359a
commit fc2e1c3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/archetypes/helm/src/main/resources/archetype-resources/pom.xml b/archetypes/helm/src/main/resources/archetype-resources/pom.xml
@@ -63,7 +63,7 @@
       </releases>
       <snapshots>
         <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
+        <updatePolicy>never</updatePolicy>
       </snapshots>
     </repository>
 
@@ -76,7 +76,7 @@
       </releases>
       <snapshots>
         <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
+        <updatePolicy>never</updatePolicy>
       </snapshots>
     </repository>
 

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
@@ -47,3 +47,5 @@ data:
   SERVICES_RENDERING_VIDEO_FORMATS: {{ .Values.config.converter.video.formats | quote }}
   SERVICES_RENDERING_VIDEO_RESOLUTIONS: {{ .Values.config.converter.video.resolution.all | quote }}
   SERVICES_RENDERING_VIDEO_DEFAULT_RESOLUTION: {{ .Values.config.converter.video.resolution.default | quote }}
+  SERVICES_RENDERING_VIDEO_THREADS: {{ .Values.config.converter.video.threads | quote }}
+  SERVICES_RENDERING_VIDEO_TIMEOUT: {{ .Values.config.converter.video.timeout | quote }}
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
@@ -142,6 +142,8 @@ config:
       resolution:
         all: "240,720,1080"
         default: "720"
+      threads: 1
+      timeout: 3600
 
   database:
     driver: pgsql

diff --git a/archetypes/project/src/main/resources/archetype-resources/pom.xml b/archetypes/project/src/main/resources/archetype-resources/pom.xml
@@ -298,7 +298,7 @@
       </releases>
       <snapshots>
         <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
+        <updatePolicy>never</updatePolicy>
       </snapshots>
     </repository>
 
@@ -311,7 +311,7 @@
       </releases>
       <snapshots>
         <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
+        <updatePolicy>never</updatePolicy>
       </snapshots>
     </repository>
 

diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
       </releases>
       <snapshots>
         <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
+        <updatePolicy>never</updatePolicy>
       </snapshots>
     </repository>
 
@@ -51,7 +51,7 @@
       </releases>
       <snapshots>
         <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
+        <updatePolicy>never</updatePolicy>
       </snapshots>
     </repository>