From 2901fcfd24d2fb33baa1b30f8b84921e6a8d690d Mon Sep 17 00:00:00 2001 From: aby913 Date: Thu, 20 Nov 2025 00:05:50 +0800 Subject: [PATCH] files: media integration, share bug fix (#2090) * files: media-server integrate, share videos play, bug fixs * files: media-server integrate, share videos play, bug fixs * share: fix some bugs notification: add apps stop reason --------- Co-authored-by: qq815776412 <815776412@qq.com> --- .../system-apps/templates/olares-app.yaml | 2 +- .../wizard/templates/wizard_deploy.yaml | 2 +- .../config/launcher/templates/bfl_deploy.yaml | 2 +- .../config/cluster/deploy/files_deploy.yaml | 42 ++++--------------- .../cluster/deploy/notification_deploy.yaml | 2 +- 5 files changed, 13 insertions(+), 37 deletions(-) diff --git a/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml b/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml index f5b46e0e8..f1a8d7fd2 100644 --- a/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml +++ b/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml @@ -318,7 +318,7 @@ spec: chown -R 1000:1000 /uploadstemp && \ chown -R 1000:1000 /appdata - name: olares-app-init - image: beclab/system-frontend:v1.6.2 + image: beclab/system-frontend:v1.6.5 imagePullPolicy: IfNotPresent command: - /bin/sh diff --git a/apps/.olares/config/user/helm-charts/wizard/templates/wizard_deploy.yaml b/apps/.olares/config/user/helm-charts/wizard/templates/wizard_deploy.yaml index b9438faa8..fada87ff5 100644 --- a/apps/.olares/config/user/helm-charts/wizard/templates/wizard_deploy.yaml +++ b/apps/.olares/config/user/helm-charts/wizard/templates/wizard_deploy.yaml @@ -29,7 +29,7 @@ spec: containers: - name: wizard - image: beclab/wizard:v1.5.11 + image: beclab/wizard:v1.6.5 imagePullPolicy: IfNotPresent ports: - containerPort: 80 diff --git a/framework/bfl/.olares/config/launcher/templates/bfl_deploy.yaml b/framework/bfl/.olares/config/launcher/templates/bfl_deploy.yaml index 676daf8b8..62a94bbe8 100644 --- a/framework/bfl/.olares/config/launcher/templates/bfl_deploy.yaml +++ b/framework/bfl/.olares/config/launcher/templates/bfl_deploy.yaml @@ -317,7 +317,7 @@ spec: apiVersion: v1 fieldPath: spec.nodeName - name: ingress - image: beclab/bfl-ingress:v0.3.26 + image: beclab/bfl-ingress:v0.3.27 imagePullPolicy: IfNotPresent env: - name: AUTHELIA_AUTH_URL diff --git a/framework/files/.olares/config/cluster/deploy/files_deploy.yaml b/framework/files/.olares/config/cluster/deploy/files_deploy.yaml index c1a3ab476..a5ab85ba1 100644 --- a/framework/files/.olares/config/cluster/deploy/files_deploy.yaml +++ b/framework/files/.olares/config/cluster/deploy/files_deploy.yaml @@ -99,34 +99,6 @@ spec: value: os_framework_files containers: - - - name: media-server - env: - - name: MEDIA_SERVER_DATA_DIR - value: /data - - name: MEDIA_SERVER_CACHE_DIR - value: /appdata - - name: SEAFILE_SERVICE - value: seafile - image: beclab/media-server:v0.2.4 - imagePullPolicy: IfNotPresent - securityContext: - allowPrivilegeEscalation: true - runAsUser: 0 - privileged: true - ports: - - containerPort: 9090 - volumeMounts: - - name: userspace-dir - mountPath: /data - - name: user-appdata-dir - mountPath: /appcache -{{ if .Values.sharedlib }} - - name: shared-lib - mountPath: /data/External - mountPropagation: Bidirectional -{{ end }} - - command: - /rclone - rcd @@ -172,7 +144,7 @@ spec: {{ end }} - name: samba-server - image: beclab/samba-server:0.0.5 + image: beclab/samba-server:0.0.6 imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: true @@ -238,7 +210,7 @@ spec: command: - /samba_share - name: files - image: beclab/files-server:v0.2.126 + image: beclab/files-server:v0.2.127 imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: true @@ -292,6 +264,10 @@ spec: value: /appdata/config/settings.json - name: FB_ROOT value: /data + - name: MEDIA_SERVER_DATA_DIR + value: /data + - name: SEAFILE_SERVICE + value: seafile - name: WATCH_DIR value: '/Home' - name: FS_TYPE @@ -850,7 +826,7 @@ data: } location /videos { - proxy_pass http://127.0.0.1:9090; + proxy_pass http://127.0.0.1:8080; # rewrite ^/server(.*)$ $1 break; # Add original-request-related headers @@ -887,8 +863,8 @@ data: proxy_send_timeout 600s; } - location /seafhttp/ { - proxy_pass http://seafile:8082/; + location /seafhttp { + proxy_pass http://127.0.0.1:8080; # rewrite ^/server(.*)$ $1 break; # Add original-request-related headers diff --git a/framework/notifications/.olares/config/cluster/deploy/notification_deploy.yaml b/framework/notifications/.olares/config/cluster/deploy/notification_deploy.yaml index 9bc11a2eb..b71e3d7b5 100644 --- a/framework/notifications/.olares/config/cluster/deploy/notification_deploy.yaml +++ b/framework/notifications/.olares/config/cluster/deploy/notification_deploy.yaml @@ -146,7 +146,7 @@ spec: value: os_framework_notifications containers: - name: notifications-api - image: beclab/notifications-api:v1.12.35 + image: beclab/notifications-api:v1.12.36 imagePullPolicy: IfNotPresent ports: - containerPort: 3010