From 0602ed4656503c675a3dea34eddbdc3f80486519 Mon Sep 17 00:00:00 2001 From: juang Date: Sun, 20 Oct 2024 20:16:39 -0300 Subject: [PATCH 1/3] Changing to podman compatible from docker compose's legacy 'links' feature see: https://github.com/docker/compose/blob/v1/docs/Compose%20file%20reference%20(legacy)/compose-versioning.md#version-2 --- docker-compose.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0bb3207..6f7c24c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,8 +19,6 @@ x-n8n: &service-n8n - N8N_PERSONALIZATION_ENABLED=false - N8N_ENCRYPTION_KEY - N8N_USER_MANAGEMENT_JWT_SECRET - links: - - postgres x-ollama: &service-ollama image: ollama/ollama:latest @@ -46,8 +44,11 @@ x-init-ollama: &init-ollama services: postgres: image: postgres:16-alpine + hostname: postgres networks: ['demo'] restart: unless-stopped + ports: + - 5432:5432 environment: - POSTGRES_USER - POSTGRES_PASSWORD @@ -62,6 +63,7 @@ services: n8n-import: <<: *service-n8n + hostname: n8n-import container_name: n8n-import entrypoint: /bin/sh command: @@ -75,6 +77,7 @@ services: n8n: <<: *service-n8n + hostname: n8n container_name: n8n restart: unless-stopped ports: @@ -91,6 +94,7 @@ services: qdrant: image: qdrant/qdrant + hostname: qdrant container_name: qdrant networks: ['demo'] restart: unless-stopped @@ -101,10 +105,12 @@ services: ollama-cpu: profiles: ["cpu"] + hostname: ollama-cpu <<: *service-ollama ollama-gpu: profiles: ["gpu-nvidia"] + hostname: ollama-gpu <<: *service-ollama deploy: resources: From 375793a549f222ef6cc480a63a38bf04269a1ea2 Mon Sep 17 00:00:00 2001 From: juang Date: Sun, 20 Oct 2024 20:24:56 -0300 Subject: [PATCH 2/3] also download ollama embeddings model --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6f7c24c..84b40b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,7 +39,7 @@ x-init-ollama: &init-ollama entrypoint: /bin/sh command: - "-c" - - "sleep 3; OLLAMA_HOST=ollama:11434 ollama pull llama3.2" + - "sleep 3; OLLAMA_HOST=ollama:11434 ollama pull llama3.2; OLLAMA_HOST=ollama:11434 ollama pull nomic-embed-text;" services: postgres: From 2b8a71509d576af35275cbbd9d3a613c77cb676e Mon Sep 17 00:00:00 2001 From: Juan Ignacio Gelos Date: Sat, 23 Nov 2024 22:15:46 +0000 Subject: [PATCH 3/3] misc --- .gitattributes | 5 +++++ docker-compose.yml | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..12cafed --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +* text=auto eol=lf + +*.{cmd,[cC][mM][dD]} text eol=crlf +*.{bat,[bB][aA][tT]} text eol=crlf + diff --git a/docker-compose.yml b/docker-compose.yml index 84b40b1..982c5ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -105,12 +105,10 @@ services: ollama-cpu: profiles: ["cpu"] - hostname: ollama-cpu <<: *service-ollama ollama-gpu: profiles: ["gpu-nvidia"] - hostname: ollama-gpu <<: *service-ollama deploy: resources: