Update ollama

apps/ollama/.env

@@ -1,47 +1,15 @@
-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=ollama
-
-# 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_REPO=ollama/ollama
+W9_DIST='community'
+W9_VERSION='latest'
+W9_POWER_PASSWORD='MuptXiqiIPB!PFm2'
+W9_HTTP_PORT_SET='9001'
+W9_ID='ollama'
+W9_HTTP_PORT=11434
+W9_URL='internet_ip:$W9_HTTP_PORT_SET'
 W9_URL_REPLACE=true
-
 W9_NETWORK=websoft9
 
 #### ----------------------------------------------------------------------------------------- ####
 
 
-# Below environment is created by apphub
-
-#W9_NAME=""
-#W9_RCODE=""
+# Below environment is created by app: https://github.com/ollama/ollama/blob/main/docs/docker.md

apps/ollama/Notes.md

@@ -1,2 +1,8 @@
-# Appname
+# Ollama
+
+Default is not have GPU support, if need use GPU, please 
+
+1. Install [GPU docker](https://github.com/ollama/ollama/blob/main/docs/docker.md)
+2. Modify `profiles` at docker-compose.yml to change default service
+
 ## FAQ

apps/ollama/docker-compose.yml

@@ -1,48 +1,50 @@
-# image,docs: https://hub.docker.com/_/wordpress/
+# image and docs: https://hub.docker.com/r/ollama/ollama
+# docs: https://github.com/ollama/ollama/blob/main/docs/docker.md
 
 services:
 
-  wordpress:
+  app-nogpu:
     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'
+          cpus: '2'
     ports:
-      - $W9_HTTP_PORT_SET:80
-    env_file: .env
+      - $W9_HTTP_PORT_SET:11434
+    env_file: 
+      - .env
     volumes:
-      - wordpress:/var/www/html
-      - ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
+      - ollama:/root/.ollama
 
-  mariadb:
-    image: mariadb:10.4
-    container_name: $W9_ID-mariadb
+  app-nvidia:
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID
     restart: unless-stopped
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
+    deploy:
+      resources:
+        limits:
+          memory: 5g
+          cpus: '2'
+        reservations:
+          devices:
+            - driver: nvidia
+              count: all
+              capabilities: [gpu]
+    runtime: nvidia
+    ports:
+      - $W9_HTTP_PORT_SET:11434
+    env_file: 
+      - .env
     volumes:
-      - mysql_data:/var/lib/mysql
-    environment:
-      MYSQL_DATABASE: $W9_ID
-      MYSQL_USER: $W9_ID
-      MYSQL_PASSWORD: $W9_POWER_PASSWORD
-      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
+      - ollama:/root/.ollama
+    profiles:
+      - nvidia
 
 volumes:
-  wordpress:
-  mysql_data:
+  ollama:
 
 networks:
   default:

apps/ollama/variables.json

@@ -15,7 +15,7 @@
   "requirements": {
     "cpu": "2",
     "memory": "4",
-    "disk": "1",
+    "disk": "10",
     "url": "https://ollama.com"
   }
 }