소스 검색

fix: readme.md formatting

Timothy J. Baek 1 년 전
부모
커밋
7313e4246a
6개의 변경된 파일99개의 추가작업 그리고 82개의 파일을 삭제
  1. 35 0
      INSTALLATION.md
  2. 62 62
      README.md
  3. 1 0
      docker-compose.api.yaml
  4. 0 7
      docker-compose.api.yml
  5. 1 0
      docker-compose.gpu.yaml
  6. 0 13
      docker-compose.gpu.yml

+ 35 - 0
INSTALLATION.md

@@ -0,0 +1,35 @@
+### Installing Both Ollama and Ollama Web UI Using Kustomize
+
+For cpu-only pod
+
+```bash
+kubectl apply -f ./kubernetes/manifest/base
+```
+
+For gpu-enabled pod
+
+```bash
+kubectl apply -k ./kubernetes/manifest
+```
+
+### Installing Both Ollama and Ollama Web UI Using Helm
+
+Package Helm file first
+
+```bash
+helm package ./kubernetes/helm/
+```
+
+For cpu-only pod
+
+```bash
+helm install ollama-webui ./ollama-webui-*.tgz
+```
+
+For gpu-enabled pod
+
+```bash
+helm install ollama-webui ./ollama-webui-*.tgz --set ollama.resources.limits.nvidia.com/gpu="1"
+```
+
+Check the `kubernetes/helm/values.yaml` file to know which parameters are available for customization

+ 62 - 62
README.md

@@ -79,113 +79,113 @@ Don't forget to explore our sibling project, [OllamaHub](https://ollamahub.com/)
 
 - **Privacy and Data Security:** We prioritize your privacy and data security above all. Please be reassured that all data entered into the Ollama Web UI is stored locally on your device. Our system is designed to be privacy-first, ensuring that no external requests are made, and your data does not leave your local environment. We are committed to maintaining the highest standards of data privacy and security, ensuring that your information remains confidential and under your control.
 
-### Installing Both Ollama and Ollama Web UI Using Provided run-compose.sh bash script
-Also available on Windows under any docker-enabled WSL2 linux distro (you have to enable it from Docker Desktop)
+### Installing Ollama Web UI Only
 
-Simply run the following command:
-Grant execute permission to script
-```bash
-chmod +x run-compose.sh
-```
+#### Prerequisites
 
-For CPU only container
-```bash
-./run-compose.sh
-```
+Make sure you have the latest version of Ollama installed before proceeding with the installation. You can find the latest version of Ollama at [https://ollama.ai/](https://ollama.ai/).
 
-For GPU enabled container (to enable this you must have your gpu driver for docker, it mostly works with nvidia so this is the official install guide: [nvidia-container-toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html))
-Warning! A GPU-enabled installation has only been tested using linux and nvidia GPU, full functionalities are not guaranteed under Windows or Macos or using a different GPU
-```bash
-./run-compose.sh --enable-gpu
-```
+##### Checking Ollama
 
-Note that both the above commands will use the latest production docker image in repository, to be able to build the latest local version you'll need to append the `--build` parameter, for example:
-```bash
-./run-compose.sh --enable-gpu --build
-```
+After installing Ollama, verify that Ollama is running by accessing the following link in your web browser: [http://127.0.0.1:11434/](http://127.0.0.1:11434/). Note that the port number may differ based on your system configuration.
 
-### Installing Both Ollama and Ollama Web UI Using Docker Compose
-To install using docker compose script as CPU-only installation simply run this command
-```bash
-docker compose up -d
-```
+#### Using Docker 🐳
 
-for a GPU-enabled installation (provided you installed the necessary gpu drivers and you are using nvidia)
-```bash
-docker compose -f docker-compose.yaml -f docker-compose.gpu.yaml up -d
-```
+**Important:** When using Docker to install Ollama Web UI, make sure to include the `-v ollama-webui:/app/backend/data` in your Docker command. This step is crucial as it ensures your database is properly mounted and prevents any loss of data.
+
+If Ollama is hosted on your local machine and accessible at [http://127.0.0.1:11434/](http://127.0.0.1:11434/), run the following command:
 
-### Installing Both Ollama and Ollama Web UI Using Kustomize
-For cpu-only pod
 ```bash
-kubectl apply -f ./kubernetes/manifest/base
+docker run -d -p 3000:8080 --add-host=host.docker.internal:host-gateway -v ollama-webui:/app/backend/data --name ollama-webui --restart always ghcr.io/ollama-webui/ollama-webui:main
 ```
-For gpu-enabled pod
+
+Alternatively, if you prefer to build the container yourself, use the following command:
+
 ```bash
-kubectl apply -k ./kubernetes/manifest
+docker build -t ollama-webui .
+docker run -d -p 3000:8080 --add-host=host.docker.internal:host-gateway -v ollama-webui:/app/backend/data --name ollama-webui --restart always ollama-webui
 ```
 
-### Installing Both Ollama and Ollama Web UI Using Helm
-Package Helm file first
+Your Ollama Web UI should now be hosted at [http://localhost:3000](http://localhost:3000) and accessible over LAN (or Network). Enjoy! 😄
+
+#### Accessing External Ollama on a Different Server
+
+Change `OLLAMA_API_BASE_URL` environment variable to match the external Ollama Server url:
+
 ```bash
-helm package ./kubernetes/helm/
+docker run -d -p 3000:8080 -e OLLAMA_API_BASE_URL=https://example.com/api -v ollama-webui:/app/backend/data --name ollama-webui --restart always ghcr.io/ollama-webui/ollama-webui:main
 ```
 
-For cpu-only pod
+Alternatively, if you prefer to build the container yourself, use the following command:
+
 ```bash
-helm install ollama-webui ./ollama-webui-*.tgz
+docker build -t ollama-webui .
+docker run -d -p 3000:8080 -e OLLAMA_API_BASE_URL=https://example.com/api -v ollama-webui:/app/backend/data --name ollama-webui --restart always ollama-webui
 ```
-For gpu-enabled pod
+
+### Installing Both Ollama and Ollama Web UI
+
+#### Using Docker Compose
+
+If you don't have Ollama installed yet, you can use the provided Docker Compose file for a hassle-free installation. Simply run the following command:
+
 ```bash
-helm install ollama-webui ./ollama-webui-*.tgz --set ollama.resources.limits.nvidia.com/gpu="1"
+docker compose up -d --build
 ```
 
-Check the `kubernetes/helm/values.yaml` file to know which parameters are available for customization
+This command will install both Ollama and Ollama Web UI on your system.
 
-### Installing Ollama Web UI Only
+##### Enable GPU
 
-#### Prerequisites
+Use the additional Docker Compose file designed to enable GPU support by running the following command:
 
-Make sure you have the latest version of Ollama installed before proceeding with the installation. You can find the latest version of Ollama at [https://ollama.ai/](https://ollama.ai/).
+```bash
+docker compose -f docker-compose.yaml -f docker-compose.gpu.yaml up -d --build
+```
 
-##### Checking Ollama
+##### Expose Ollama API outside the container stack
 
-After installing Ollama, verify that Ollama is running by accessing the following link in your web browser: [http://127.0.0.1:11434/](http://127.0.0.1:11434/). Note that the port number may differ based on your system configuration.
+Deploy the service with an additional Docker Compose file designed for API exposure:
 
-#### Using Docker 🐳
+```bash
+docker compose -f docker-compose.yaml -f docker-compose.api.yaml up -d --build
+```
 
-**Important:** When using Docker to install Ollama Web UI, make sure to include the `-v ollama-webui:/app/backend/data` in your Docker command. This step is crucial as it ensures your database is properly mounted and prevents any loss of data.
+#### Using Provided `run-compose.sh` Script (Linux)
 
-If Ollama is hosted on your local machine and accessible at [http://127.0.0.1:11434/](http://127.0.0.1:11434/), run the following command:
+Also available on Windows under any docker-enabled WSL2 linux distro (you have to enable it from Docker Desktop)
+
+Simply run the following command to grant execute permission to script:
 
 ```bash
-docker run -d -p 3000:8080 --add-host=host.docker.internal:host-gateway -v ollama-webui:/app/backend/data --name ollama-webui --restart always ghcr.io/ollama-webui/ollama-webui:main
+chmod +x run-compose.sh
 ```
 
-Alternatively, if you prefer to build the container yourself, use the following command:
+##### For CPU only container
 
 ```bash
-docker build -t ollama-webui .
-docker run -d -p 3000:8080 --add-host=host.docker.internal:host-gateway -v ollama-webui:/app/backend/data --name ollama-webui --restart always ollama-webui
+./run-compose.sh
 ```
 
-Your Ollama Web UI should now be hosted at [http://localhost:3000](http://localhost:3000) and accessible over LAN (or Network). Enjoy! 😄
-
-#### Accessing External Ollama on a Different Server
+##### Enable GPU
 
-Change `OLLAMA_API_BASE_URL` environment variable to match the external Ollama Server url:
+For GPU enabled container (to enable this you must have your gpu driver for docker, it mostly works with nvidia so this is the official install guide: [nvidia-container-toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html))
+Warning! A GPU-enabled installation has only been tested using linux and nvidia GPU, full functionalities are not guaranteed under Windows or Macos or using a different GPU
 
 ```bash
-docker run -d -p 3000:8080 -e OLLAMA_API_BASE_URL=https://example.com/api -v ollama-webui:/app/backend/data --name ollama-webui --restart always ghcr.io/ollama-webui/ollama-webui:main
+./run-compose.sh --enable-gpu
 ```
 
-Alternatively, if you prefer to build the container yourself, use the following command:
+Note that both the above commands will use the latest production docker image in repository, to be able to build the latest local version you'll need to append the `--build` parameter, for example:
 
 ```bash
-docker build -t ollama-webui .
-docker run -d -p 3000:8080 -e OLLAMA_API_BASE_URL=https://example.com/api -v ollama-webui:/app/backend/data --name ollama-webui --restart always ollama-webui
+./run-compose.sh --enable-gpu --build
 ```
 
+#### Using Alternative Methods (Kustomize or Helm)
+
+See [INSTALLATION.md](/INSTALLATION.md) for information on how to install and/or join our [Ollama Web UI Discord community](https://discord.gg/5rJgQTnV4s).
+
 ## How to Install Without Docker
 
 While we strongly recommend using our convenient Docker container installation for optimal support, we understand that some situations may require a non-Docker setup, especially for development purposes. Please note that non-Docker installations are not officially supported, and you might need to troubleshoot on your own.

+ 1 - 0
docker-compose.api.yaml

@@ -2,5 +2,6 @@ version: '3.8'
 
 services:
   ollama:
+    # Expose Ollama API outside the container stack
     ports:
       - ${OLLAMA_WEBAPI_PORT-11434}:11434

+ 0 - 7
docker-compose.api.yml

@@ -1,7 +0,0 @@
-version: '3.6'
-
-services:
-  ollama:
-    # Expose Ollama API outside the container stack
-    ports:
-      - 11434:11434

+ 1 - 0
docker-compose.gpu.yaml

@@ -2,6 +2,7 @@ version: '3.8'
 
 services:
   ollama:
+    # GPU support
     deploy:
       resources:
         reservations:

+ 0 - 13
docker-compose.gpu.yml

@@ -1,13 +0,0 @@
-version: '3.6'
-
-services:
-  ollama:
-    # GPU support
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: 1
-              capabilities:
-                - gpu