Merge the Dev branch

add_apps.json

@@ -1,44 +1,24 @@
 [
   {
-    "name": "safeline",
-    "trademark": "SafeLine",
+    "name": "databasus",
+    "trademark": "Databasus",
     "release": false,
-    "fork_url": "https://github.com/chaitin/SafeLine",
-    "version_from": "swr.cn-east-3.myhuaweicloud.com/chaitin-safeline/safeline-mgt-g",
+    "fork_url": "https://github.com/databasus/databasus",
+    "version_from": "https://hub.docker.com/r/databasus/databasus/tags",
     "edition": [
       {
         "dist": "community",
         "version": [
-          "9.3.2"
+          "v3.9.0",
+          "latest"
         ]
       }
     ],
     "requirements": {
       "cpu": "2",
       "memory": "4",
       "disk": "10",
-      "url": "https://safepoint.cloud"
-    }
-  },
-  {
-    "name": "moltbot",
-    "trademark": "Moltbot",
-    "release": false,
-    "fork_url": "https://github.com/moltbot/moltbot",
-    "version_from": "ghcr.io/moltbot/clawdbot:main",
-    "edition": [
-      {
-        "dist": "community",
-        "version": [
-          "9.3.2"
-        ]
-      }
-    ],
-    "requirements": {
-      "cpu": "2",
-      "memory": "4",
-      "disk": "10",
-      "url": "https://clawd.bot"
+      "url": "https://databasus.com"
     }
   }
 ]

apps/databasus/.env

@@ -0,0 +1,11 @@
+W9_REPO="databasus/databasus"
+W9_DIST=community
+W9_VERSION="latest"
+
+W9_HTTP_PORT_SET=9001
+W9_ID=databasus
+W9_HTTP_PORT=4005
+W9_URL=internet_ip:$W9_HTTP_PORT_SET
+W9_NETWORK=websoft9
+
+#### ----------------------------------------------------------------------------------------- ####

apps/databasus/docker-compose.yml

@@ -0,0 +1,20 @@
+# image,docs: https://databasus.com/installation
+
+services:
+  databasus:
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID
+    env_file: .env
+    ports:
+      - "$W9_HTTP_PORT_SET:4005"
+    volumes:
+      - databasus-data:/databasus-data
+    restart: unless-stopped
+
+volumes:
+  databasus-data:
+
+networks:
+  default:
+    name: $W9_NETWORK
+    external: true

apps/databasus/src/nginx-proxy.conf.template

@@ -0,0 +1,57 @@
+proxy_busy_buffers_size   512k;
+proxy_buffers   4 512k;
+proxy_buffer_size   256k;
+client_max_body_size 50m;
+# override default location /
+location / {
+        add_header       X-Served-By $host;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-Scheme $scheme;
+        proxy_set_header X-Forwarded-Proto  $scheme;
+        proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real-IP          $remote_addr;
+        proxy_pass       $forward_scheme://$server:$port$request_uri;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection upgrade;
+    }
+
+location /console {
+    proxy_pass http://$server:8080; 
+    proxy_http_version 1.1;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+}
+
+# for echo some useful information
+location / {
+    default_type text/plain;
+    return 200 'Hello World';
+}
+
+location /oida/ {
+# this is the address and port of the ORDS installation
+proxy_pass http://127.0.0.1:8080/ords/;
+
+# set Origin to blank to avoid Chrome problems with CORS
+proxy_set_header Origin "" ;
+
+# pass along some header variables with the public host name/port/and so on
+proxy_set_header Host $host;
+proxy_set_header X-Forwarded-Host $host:$server_port;
+proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $scheme;
+
+# this reverse proxies any "location" headers being passed in the response
+proxy_redirect http://$host/ords/ https://$host/oida/;
+
+# also tell cookies their public path
+proxy_cookie_path /ords/ /oida/;
+
+# reverse proxy links included in response (ie from ORDS webservice)
+sub_filter_types application/json ;
+sub_filter http://$host/ords/ https://$host/oida/;
+sub_filter_once off;
+}

apps/databasus/src/php_exra.ini

@@ -0,0 +1,8 @@
+file_uploads = On
+max_input_time = 800
+max_execution_time = 300
+memory_limit = 600M
+upload_max_filesize = 900M
+post_max_size = 900M
+max_file_uploads = 200
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT

apps/databasus/variables.json

@@ -0,0 +1,22 @@
+{
+  "name": "databasus",
+  "trademark": "Databasus",
+  "release": false,
+  "fork_url": "https://github.com/databasus/databasus",
+  "version_from": "https://hub.docker.com/r/databasus/databasus/tags",
+  "edition": [
+    {
+      "dist": "community",
+      "version": [
+        "v3.9.0",
+        "latest"
+      ]
+    }
+  ],
+  "requirements": {
+    "cpu": "2",
+    "memory": "4",
+    "disk": "10",
+    "url": "https://databasus.com"
+  }
+}

apps/erpnext/.env

@@ -1,6 +1,7 @@
 W9_REPO=frappe/erpnext
 W9_DIST=community
-W9_VERSION=v15.34.1
+W9_VERSION=v16.7.3
+W9_HRMS_BRANCH=version-16
 
 W9_ID=erpnext
 W9_POWER_PASSWORD=1PrMxExC45LsCT

apps/erpnext/CHANGELOG.md

@@ -1,5 +1,16 @@
-# CHANGELOG
+# Changelog
 
-## Release
-### Fixes and Enhancements
+All notable changes to this project will be documented in this file.
+
+The format is based on Keep a Changelog, and this project follows Semantic Versioning.
+
+## [16.0.0] - 2026-03-12
+
+### Changed
+
+- Upgraded ERPNext to v16.
+
+### Added
+
+- Added the HR module introduced in ERPNext v16.
 

apps/erpnext/Notes.md

@@ -47,6 +47,11 @@ password: admin
 这是怎么回事呢？通过官方的论坛中研究，发现这是文档更新不及时导致，也就是说overrides中的安装在文档中还没有体现，虽然它更具有效率。  
 
 
+### 安装完成后执行命令，同步hrms资源，解决图片不显示
+```
+docker compose exec frontend bash -lc 'set -euxo pipefail; cd /home/frappe/frappe-bench; id; ls -ld apps/hrms/hrms/public; mkdir -p sites/assets/hrms; cp -a apps/hrms/hrms/public/. sites/assets/hrms/; ls -lah sites/assets/hrms; ls -lah sites/assets/hrms/images/frappe-hr-logo.svg'
+```
+
 #### 与URL有关的变量有那些？
 
 ```

apps/erpnext/README.md

@@ -3,7 +3,7 @@
 This is an **[Docker Compose template](https://github.com/Websoft9/docker-library)** powered by [Websoft9](https://www.websoft9.com) based on Docker for ERPNext:
 
 
- - community:  v15, v14, v13
+ - community:  v16, v15, v14
 
 
 ## System Requirements