Merge pull request #977 from truenas/NAS-119718

NAS-119718 / 23.10 / Adds lifecycle hook to install ffmpeg in NC

charts/nextcloud/1.6.16/Chart.yaml → charts/nextcloud/1.6.17/Chart.yaml

@@ -19,4 +19,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 upstream_version: 2.3.2
-version: 1.6.16
+version: 1.6.17

test/nextcloud/1.6.16/questions.yaml → charts/nextcloud/1.6.17/questions.yaml

@@ -104,6 +104,12 @@ questions:
             type: path
             default: "/var/www/html/data"
             required: true
+        - variable: install_ffmpeg
+          label: "Install ffmpeg"
+          description: "Automatically Install ffmpeg when the container starts"
+          schema:
+            type: boolean
+            default: false
 
   - variable: cronjob
     description: "Setup cronjob for nextcloud"

charts/nextcloud/1.6.16/templates/deployment.yaml → charts/nextcloud/1.6.17/templates/deployment.yaml

@@ -56,6 +56,48 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
         - name: http
           containerPort: 80
           protocol: TCP
+        livenessProbe:
+          httpGet:
+            path: /status.php
+            port: http
+            httpHeaders:
+            - name: Host
+              value: localhost
+          initialDelaySeconds: 30
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 5
+        readinessProbe:
+          httpGet:
+            path: /status.php
+            port: http
+            httpHeaders:
+            - name: Host
+              value: localhost
+          initialDelaySeconds: 30
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 5
+        startupProbe:
+        {{- if .Values.nextcloud.install_ffmpeg }}
+          exec:
+            command:
+              - /bin/sh
+              - -c
+              - |
+                command -v ffmpeg /dev/null 2>&1 || exit 1
+        {{- else }}
+          httpGet:
+            path: /status.php
+            port: http
+            httpHeaders:
+            - name: Host
+              value: localhost
+        {{- end }}
+          initialDelaySeconds: 60
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 60
         volumeMounts:
         - name: nextcloud-data
           mountPath: /var/www/
@@ -82,6 +124,20 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
         - name: extrappvolume-{{ $index }}
           mountPath: {{ $hostPathConfiguration.mountPath }}
         {{ end }}
+        {{- if .Values.nextcloud.install_ffmpeg }}
+        lifecycle:
+          postStart:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - |
+                  echo "Installing ffmpeg..."
+                  apt update && \
+                  apt install -y --no-install-recommends \
+                  ffmpeg || echo "Failed to install ffmpeg"
+                  echo "Finished."
+        {{- end }}
 {{ include "common.networking.dnsConfiguration" .Values | nindent 6 }}
       volumes:
         - name: nginx-configuration

test/nextcloud/1.6.16/test_values.yaml → charts/nextcloud/1.6.17/test_values.yaml

@@ -19,6 +19,7 @@ nextcloud:
   host: nextcloud.kube.home
   password: changeme
   username: admin
+  install_ffmpeg: true
 nginx:
   image:
     pullPolicy: IfNotPresent

test/nextcloud/1.6.16/Chart.yaml → test/nextcloud/1.6.17/Chart.yaml

@@ -19,4 +19,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 upstream_version: 2.3.2
-version: 1.6.16
+version: 1.6.17

charts/nextcloud/1.6.16/questions.yaml → test/nextcloud/1.6.17/questions.yaml

@@ -104,6 +104,12 @@ questions:
             type: path
             default: "/var/www/html/data"
             required: true
+        - variable: install_ffmpeg
+          label: "Install ffmpeg"
+          description: "Automatically Install ffmpeg when the container starts"
+          schema:
+            type: boolean
+            default: false
 
   - variable: cronjob
     description: "Setup cronjob for nextcloud"

test/nextcloud/1.6.16/templates/deployment.yaml → test/nextcloud/1.6.17/templates/deployment.yaml

@@ -56,6 +56,48 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
         - name: http
           containerPort: 80
           protocol: TCP
+        livenessProbe:
+          httpGet:
+            path: /status.php
+            port: http
+            httpHeaders:
+            - name: Host
+              value: localhost
+          initialDelaySeconds: 30
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 5
+        readinessProbe:
+          httpGet:
+            path: /status.php
+            port: http
+            httpHeaders:
+            - name: Host
+              value: localhost
+          initialDelaySeconds: 30
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 5
+        startupProbe:
+        {{- if .Values.nextcloud.install_ffmpeg }}
+          exec:
+            command:
+              - /bin/sh
+              - -c
+              - |
+                command -v ffmpeg /dev/null 2>&1 || exit 1
+        {{- else }}
+          httpGet:
+            path: /status.php
+            port: http
+            httpHeaders:
+            - name: Host
+              value: localhost
+        {{- end }}
+          initialDelaySeconds: 60
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 60
         volumeMounts:
         - name: nextcloud-data
           mountPath: /var/www/
@@ -82,6 +124,20 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
         - name: extrappvolume-{{ $index }}
           mountPath: {{ $hostPathConfiguration.mountPath }}
         {{ end }}
+        {{- if .Values.nextcloud.install_ffmpeg }}
+        lifecycle:
+          postStart:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - |
+                  echo "Installing ffmpeg..."
+                  apt update && \
+                  apt install -y --no-install-recommends \
+                  ffmpeg || echo "Failed to install ffmpeg"
+                  echo "Finished."
+        {{- end }}
 {{ include "common.networking.dnsConfiguration" .Values | nindent 6 }}
       volumes:
         - name: nginx-configuration

charts/nextcloud/1.6.16/test_values.yaml → test/nextcloud/1.6.17/test_values.yaml

@@ -19,6 +19,7 @@ nextcloud:
   host: nextcloud.kube.home
   password: changeme
   username: admin
+  install_ffmpeg: true
 nginx:
   image:
     pullPolicy: IfNotPresent