fix: cherry pick from the main branch ( #657 ... )

beclab · Nov 22, 2024 · 1f73f79 · 1f73f79
1 parent 6c6cecf
commit 1f73f79
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 13 deletions.
diff --git a/apps/files/config/user/helm-charts/files/templates/files_fe_deploy.yaml b/apps/files/config/user/helm-charts/files/templates/files_fe_deploy.yaml
@@ -283,7 +283,7 @@ spec:
 #        - /filebrowser
 #        - --noauth
       - name: files-frontend
-        image: beclab/files-frontend:v1.2.61
+        image: beclab/files-frontend:v1.2.62
         imagePullPolicy: IfNotPresent
         securityContext:
           runAsNonRoot: false

diff --git a/apps/settings/config/user/helm-charts/settings/templates/settings_deploy.yaml b/apps/settings/config/user/helm-charts/settings/templates/settings_deploy.yaml
@@ -68,13 +68,13 @@ spec:
               fieldPath: status.podIP
       containers:
       - name: settings
-        image: beclab/settings:v0.1.92
+        image: beclab/settings:v0.1.93
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80
 
       - name: settings-server
-        image: beclab/settings-server:v0.1.92
+        image: beclab/settings-server:v0.1.93
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 3000
@@ -91,6 +91,12 @@ spec:
           value: '{{ .Values.os.settings.appSecret }}'
         - name: OS_APP_KEY
           value: {{ .Values.os.settings.appKey }}
+        - name: NODE_IP
+          valueFrom:
+              fieldRef:
+                fieldPath: status.hostIP
+        - name: TERMINUSD_HOST
+          value: $(NODE_IP):18088
         - name: APP_SERVICE_SERVICE_HOST
           value: app-service.os-system
         - name: APP_SERVICE_SERVICE_PORT

diff --git a/apps/system-apps/config/user/helm-charts/monitoring/templates/system-frontend.yaml b/apps/system-apps/config/user/helm-charts/monitoring/templates/system-frontend.yaml
@@ -196,7 +196,7 @@ spec:
             - mountPath: /www
               name: www-dir
         - name: wise-init
-          image: beclab/wise:v1.2.61
+          image: beclab/wise:v1.2.62
           imagePullPolicy: IfNotPresent
           command:
             - /bin/sh

diff --git a/apps/vault/config/cluster/deploy/vault_server_deploy.yaml b/apps/vault/config/cluster/deploy/vault_server_deploy.yaml
@@ -83,7 +83,7 @@ spec:
             value: os_system_vault
       containers:
       - name: vault-server
-        image: beclab/vault-server:v1.2.61
+        image: beclab/vault-server:v1.2.62
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 3000
@@ -114,7 +114,7 @@ spec:
         - name: vault-attach
           mountPath: /padloc/packages/server/attachments
       - name: vault-admin
-        image: beclab/vault-admin:v1.2.61
+        image: beclab/vault-admin:v1.2.62
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 3010

diff --git a/apps/vault/config/user/helm-charts/vault/templates/vault_deploy.yaml b/apps/vault/config/user/helm-charts/vault/templates/vault_deploy.yaml
@@ -72,13 +72,13 @@ spec:
 
       containers:
       - name: vault-frontend
-        image: beclab/vault-frontend:v1.2.61
+        image: beclab/vault-frontend:v1.2.62
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80
 
       - name: notification-server
-        image: beclab/vault-notification:v1.2.61
+        image: beclab/vault-notification:v1.2.62
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 3010

diff --git a/build/installer/install.ps1 b/build/installer/install.ps1
@@ -19,7 +19,7 @@ if ($architecture -like "ARM") {
   $arch = "arm64"
 }
 
-$CLI_VERSION = "0.1.58"
+$CLI_VERSION = "0.1.61"
 $CLI_FILE = "olares-cli-v{0}_windows_{1}.tar.gz" -f $CLI_VERSION, $arch
 $CLI_URL = "https://dc3p1870nn3cj.cloudfront.net/{0}" -f $CLI_FILE
 $CLI_PATH = "{0}\{1}"  -f $currentPath, $CLI_FILE

diff --git a/build/installer/install.sh b/build/installer/install.sh
@@ -67,7 +67,7 @@ if [ -z ${cdn_url} ]; then
     cdn_url="https://dc3p1870nn3cj.cloudfront.net"
 fi
 
-CLI_VERSION="0.1.58"
+CLI_VERSION="0.1.61"
 CLI_FILE="olares-cli-v${CLI_VERSION}_linux_${ARCH}.tar.gz"
 if [[ x"$os_type" == x"Darwin" ]]; then
     CLI_FILE="olares-cli-v${CLI_VERSION}_darwin_${ARCH}.tar.gz"

diff --git a/build/manifest/components b/build/manifest/components
@@ -1,4 +1,4 @@
-olaresd-v0.0.43.tar.gz,pkg/components,https://dc3p1870nn3cj.cloudfront.net/olaresd-v0.0.43-linux-amd64.tar.gz,https://dc3p1870nn3cj.cloudfront.net/olaresd-v0.0.43-linux-arm64.tar.gz,olaresd
+olaresd-v0.0.45.tar.gz,pkg/components,https://dc3p1870nn3cj.cloudfront.net/olaresd-v0.0.45-linux-amd64.tar.gz,https://dc3p1870nn3cj.cloudfront.net/olaresd-v0.0.45-linux-arm64.tar.gz,olaresd
 socat-1.7.3.2.tar.gz,pkg/components,https://src.fedoraproject.org/lookaside/pkgs/socat/socat-1.7.3.2.tar.gz/sha512/540658b2a3d1b87673196282e5c62b97681bd0f1d1e4759ff9d72909d11060235ee9e9521a973603c1b00376436a9444248e5fbc0ffac65f8edb9c9bc28e7972/socat-1.7.3.2.tar.gz,https://src.fedoraproject.org/lookaside/pkgs/socat/socat-1.7.3.2.tar.gz/sha512/540658b2a3d1b87673196282e5c62b97681bd0f1d1e4759ff9d72909d11060235ee9e9521a973603c1b00376436a9444248e5fbc0ffac65f8edb9c9bc28e7972/socat-1.7.3.2.tar.gz,socat
 conntrack-tools-1.4.1.tar.gz,pkg/components,https://github.com/fqrouter/conntrack-tools/archive/refs/tags/conntrack-tools-1.4.1.tar.gz,https://github.com/fqrouter/conntrack-tools/archive/refs/tags/conntrack-tools-1.4.1.tar.gz,conntrack-tools
 minio.RELEASE.2023-05-04T21-44-30Z,pkg/components,https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2023-05-04T21-44-30Z,https://dl.min.io/server/minio/release/linux-arm64/archive/minio.RELEASE.2023-05-04T21-44-30Z,minio

diff --git a/frameworks/app-service/config/cluster/deploy/appservice_deploy.yaml b/frameworks/app-service/config/cluster/deploy/appservice_deploy.yaml
@@ -148,7 +148,7 @@ spec:
       serviceAccount: os-internal
       containers:
       - name: app-service
-        image: beclab/app-service:0.2.50
+        image: beclab/app-service:0.2.51
         imagePullPolicy: IfNotPresent
         securityContext:
           runAsUser: 0
@@ -360,7 +360,7 @@ spec:
       hostNetwork: true
       containers:
         - name: image-service
-          image: beclab/image-service:0.2.40
+          image: beclab/image-service:0.2.51
           imagePullPolicy: IfNotPresent
           securityContext:
             runAsUser: 0