Merge pull request #1285 from Websoft9/dev

remove Ollama resource limit

add_apps.json

@@ -1,10 +1,10 @@
 [
   {
-    "name": "glance",
-    "trademark": "Glance",
+    "name": "dify",
+    "trademark": "Dify",
     "release": false,
-    "fork_url": "https://github.com/glanceapp/glance",
-    "version_from": "https://hub.docker.com/r/glanceapp/glance/tags",
+    "fork_url": "https://github.com/langgenius/dify",
+    "version_from": "https://hub.docker.com/r/langgenius/dify-api/tags",
     "edition": [
       {
         "dist": "community",
@@ -17,15 +17,15 @@
       "cpu": "2",
       "memory": "4",
       "disk": "10",
-      "url": "https://github.com/glanceapp/glance"
+      "url": "https://dify.ai"
     }
   },
   {
-    "name": "lemmy",
-    "trademark": "Lemmy",
+    "name": "xinference",
+    "trademark": "Xinference",
     "release": false,
-    "fork_url": "https://github.com/LemmyNet/lemmy",
-    "version_from": "https://hub.docker.com/r/dessalines/lemmy/tags",
+    "fork_url": "https://github.com/xorbitsai/inference",
+    "version_from": "https://hub.docker.com/r/xprobe/xinference/tags",
     "edition": [
       {
         "dist": "community",
@@ -38,15 +38,15 @@
       "cpu": "2",
       "memory": "4",
       "disk": "10",
-      "url": "https://join-lemmy.org"
+      "url": "https://inference.readthedocs.io"
     }
   },
   {
-    "name": "web-check",
-    "trademark": "Web-Check",
+    "name": "windmill",
+    "trademark": "Windmill",
     "release": false,
-    "fork_url": "https://github.com/Lissy93/web-check",
-    "version_from": "https://hub.docker.com/r/lissy93/web-check/tags",
+    "fork_url": "https://github.com/windmill-labs/windmill",
+    "version_from": "ghcr.io/windmill-labs/windmill",
     "edition": [
       {
         "dist": "community",
@@ -59,15 +59,15 @@
       "cpu": "2",
       "memory": "4",
       "disk": "10",
-      "url": "https://web-check.xyz"
+      "url": "https://www.windmill.dev"
     }
   },
   {
-    "name": "nexterm",
-    "trademark": "Nexterm",
+    "name": "bigagi",
+    "trademark": "Big-AGI",
     "release": false,
-    "fork_url": "https://github.com/gnmyt/Nexterm",
-    "version_from": "https://hub.docker.com/r/germannewsmaker/nexterm/tags",
+    "fork_url": "https://github.com/enricoros/big-agi",
+    "version_from": "ghcr.io/enricoros/big-agi",
     "edition": [
       {
         "dist": "community",
@@ -80,28 +80,7 @@
       "cpu": "2",
       "memory": "4",
       "disk": "10",
-      "url": "https://docs.nexterm.dev"
-    }
-  },
-  {
-    "name": "crowdsec",
-    "trademark": "CrowdSec",
-    "release": false,
-    "fork_url": "https://github.com/crowdsecurity/crowdsec",
-    "version_from": "https://hub.docker.com/r/crowdsecurity/crowdsec/tags",
-    "edition": [
-      {
-        "dist": "community",
-        "version": [
-          "latest"
-        ]
-      }
-    ],
-    "requirements": {
-      "cpu": "2",
-      "memory": "4",
-      "disk": "10",
-      "url": "https://www.crowdsec.net/"
+      "url": "https://big-agi.com"
     }
   }
 ]

apps/bigagi/.env

@@ -0,0 +1,53 @@
+W9_REPO="wordpress"
+W9_DIST=community
+W9_VERSION="latest"
+
+W9_POWER_PASSWORD="1PrMxExC45LsCT"
+
+# Environments which for user settings when create application
+# Named expression: W9_xxx_xxx_SET, xxx refer to file fields
+W9_HTTP_PORT_SET=9001
+# W9_HTTPS_PORT_SET=9002
+# W9_DB_PORT_SET=3306
+# W9_SSH_PORT_SET=23
+W9_KEY_SET="dfsjdkjf77xjxcjcj"
+
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+
+W9_ID=bigagi
+
+# W9_HTTP_PORT or W9_HTTPS_PORT is need at leaset and used for proxy for web application
+# Some container (e.g teleport) need HTTPS access, then need to set this pra
+W9_HTTP_PORT=80
+W9_HTTPS_PORT=81
+
+W9_LOGIN_USER=admin
+# use https://1password.com/zh-cn/password-generator/  to genarate 14 bit password
+# this password can also use password file
+W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
+W9_ADMIN_PATH="/wp-login"
+
+# Container name's suffix must use one of the value
+W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"
+
+# It is used when the application APP needs to set an external URL, which can be IP(or domain), IP:PORT
+# If have protocols, should be set it in the APP's ENV
+W9_URL=internet_ip:$W9_HTTP_PORT_SET
+# modifies W9_URL on init when it is true
+W9_URL_REPLACE=true
+
+W9_NETWORK=websoft9
+
+#### ----------------------------------------------------------------------------------------- ####
+
+
+# Below environment is created by this app
+
+WORDPRESS_DB_HOST=$W9_ID-mariadb
+WORDPRESS_DB_USER=wordpress  #if use postgresql, it need set to postgres
+WORDPRESS_DB_PASSWORD=$W9_POWER_PASSWORD
+WORDPRESS_DB_NAME=wordpress
+
+
+#W9_NAME=""
+#W9_RCODE=""

apps/bigagi/Dockerfile

@@ -0,0 +1,21 @@
+# image: https://hub.docker.com/r/websoft9dev/discuzq
+
+FROM ccr.ccs.tencentyun.com/discuzq/dzq:latest
+
+LABEL org.opencontainers.image.authors="https://www.websoft9.com" \
+      org.opencontainers.image.description="Application packaged by Websoft9" \
+      org.opencontainers.image.source="https://github.com/Websoft9/docker-library/tree/main/apps/opencart" \
+      org.opencontainers.image.title="OpenCart" \
+      org.opencontainers.image.vendor="Websoft9 Inc." \
+      org.opencontainers.image.version="4.0.1.1"
+
+ENV DISCUZQ_MYSQL_HOST=mysql
+ENV DISCUZQ_MYSQL_USER=discuzq
+ENV DISCUZQ_MYSQL_PASSWORD=discuzq
+ENV DISCUZQ_MYSQL_DATABASE=discuzq
+ENV DISCUZQ_SITENAME=DiscuzQ
+
+COPY cmd.sh /tmp
+RUN chmod +x /tmp/cmd.sh
+
+CMD ["/tmp/cmd.sh"]

apps/bigagi/Notes.md

@@ -0,0 +1,2 @@
+# Appname
+## FAQ

apps/bigagi/README.jinja2

@@ -0,0 +1,26 @@
+# {{trademark}} on Docker  
+
+This is an **Docker Compose solution** powered by [Websoft9](https://www.websoft9.com) based on Docker for {{trademark}}:
+
+{% for ed in edition %}
+ - {{ed.dist}}:  {{ ed.version | join(', ') }}
+{% endfor %}
+
+## System Requirements
+
+The following are the minimal [recommended requirements]({{requirements.url}}):
+
+* **RAM**: {{requirements.memory}} GB or more
+* **CPU**: {{requirements.cpu}} cores or higher
+* **Disk**: at least {{requirements.disk}} GB of free space
+* **bandwidth**: more fluent experience over 100M  
+
+## Install
+
+You can install this {{trademark}} by [How to use it?](https://github.com/Websoft9/docker-library#how-to-use-it).   
+
+If you want use {{trademark}} with **Websoft9 Business Support** free, you can [subscribe {{trademark}}](https://www.websoft9.com/apps) on Cloud platform
+
+## Documentation
+
+[{{trademark}} Administrator Guide](https://support.websoft9.com/docs/{{name}}) powered by Websoft9

apps/bigagi/docker-compose.yml

@@ -0,0 +1,50 @@
+# image,docs: https://hub.docker.com/_/wordpress/
+
+services:
+
+  wordpress:
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID
+    restart: unless-stopped
+    #This is for access host from container
+    # extra_hosts: ["host.docker.internal:host-gateway"]
+    # command: |
+    #   /bin/bash -c "ping -c 3 host.docker.internal"
+    logging:
+      driver: "json-file"
+      options:
+          max-file: "5"
+          max-size: 10m
+    deploy:
+      resources:
+        limits:
+          memory: 5g
+          cpus: '0.7'
+    ports:
+      - $W9_HTTP_PORT_SET:80
+    env_file: .env
+    volumes:
+      - wordpress:/var/www/html
+      - ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
+
+  mariadb:
+    image: mariadb:10.4
+    container_name: $W9_ID-mariadb
+    restart: unless-stopped
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
+    volumes:
+      - mysql_data:/var/lib/mysql
+    environment:
+      MYSQL_DATABASE: $WORDPRESS_DB_NAME
+      MYSQL_USER: $WORDPRESS_DB_USER
+      MYSQL_PASSWORD: $W9_POWER_PASSWORD
+      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
+
+volumes:
+  wordpress:
+  mysql_data:
+
+networks:
+  default:
+    name: $W9_NETWORK
+    external: true

apps/bigagi/src/README.md

@@ -0,0 +1,3 @@
+# About
+
+This folder includes files mount to container and used by Websoft9