diff --git a/ollama/data/.gitkeep b/ollama/data/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/ollama/docker-compose.yml b/ollama/docker-compose.yml new file mode 100644 index 000000000..f6d1bd328 --- /dev/null +++ b/ollama/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' + +services: + app_proxy: + environment: + APP_HOST: ollama_ollama_1 + APP_PORT: 11434 + PROXY_AUTH_ADD: "false" + + ollama: + image: ollama/ollama:0.5.4@sha256:18bfb1d605604fd53dcad20d0556df4c781e560ebebcd923454d627c994a0e37 + volumes: + - ${APP_DATA_DIR}/data:/root/.ollama + restart: on-failure diff --git a/ollama/umbrel-app.yml b/ollama/umbrel-app.yml new file mode 100644 index 000000000..b51c71f54 --- /dev/null +++ b/ollama/umbrel-app.yml @@ -0,0 +1,24 @@ +manifestVersion: 1 +id: ollama +name: Ollama +tagline: Get up and running with large language models +category: ai +version: "0.5.4" +port: 11434 +description: >- + blah blah blah + + + We'd add some general connection instructions here. Like using ollama_ollama_1:11434 or 10.21.0.1:11434 as the URL. +developer: Ollama +website: https://ollama.com/ +submitter: al-lac +submission: https://github.com/getumbrel/umbrel-apps/pull/x +repo: https://github.com/ollama/ollama +support: https://github.com/ollama/ollama/issues +gallery: [] +defaultUsername: "" +defaultPassword: "" +dependencies: [] +releaseNotes: "" +path: "" \ No newline at end of file diff --git a/open-webui/docker-compose.yml b/open-webui/docker-compose.yml index c1feb512d..434b463da 100644 --- a/open-webui/docker-compose.yml +++ b/open-webui/docker-compose.yml @@ -7,21 +7,21 @@ services: APP_PORT: 8080 PROXY_AUTH_ADD: "false" - ollama: - image: ollama/ollama:0.5.4@sha256:18bfb1d605604fd53dcad20d0556df4c781e560ebebcd923454d627c994a0e37 - volumes: - - ${APP_DATA_DIR}/data/ollama:/root/.ollama - # We could uncomment this if we want to expose the ollama port to the host for other external apps/programs to use. - # ports: - # - 11434:11434 - restart: on-failure + # ollama: + # image: ollama/ollama:0.5.4@sha256:18bfb1d605604fd53dcad20d0556df4c781e560ebebcd923454d627c994a0e37 + # volumes: + # - ${APP_DATA_DIR}/data/ollama:/root/.ollama + # # We could uncomment this if we want to expose the ollama port to the host for other external apps/programs to use. + # # ports: + # # - 11434:11434 + # restart: on-failure web: image: ghcr.io/open-webui/open-webui:v0.5.4@sha256:42e8fa544facc38d731e3d516fbf478abe435bb4b80798e0934930afea6c5bab volumes: - ${APP_DATA_DIR}/data/open-webui:/app/backend/data - depends_on: - - ollama - environment: - OLLAMA_BASE_URL: "http://open-webui_ollama_1:11434" + # depends_on: + # - ollama + # environment: + # OLLAMA_BASE_URL: "http://open-webui_ollama_1:11434" restart: on-failure