From 5791fc9b83b8a5da51d7994e5952a3555cfe4a81 Mon Sep 17 00:00:00 2001
From: Isaac Shoebottom <ir.shoebottom@gmail.com>
Date: Thu, 24 Apr 2025 20:08:17 -0300
Subject: [PATCH] Rework networking a bit

---
 dockovpn/docker-compose.yml   |  6 +-----
 gotify/docker-compose.yml     |  8 +-------
 ollama/docker-compose.yml     | 11 ++++++++++-
 open-webui/docker-compose.yml |  8 ++++++--
 terraria/docker-compose.yml   |  6 +-----
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/dockovpn/docker-compose.yml b/dockovpn/docker-compose.yml
index 776310e..ec5947f 100644
--- a/dockovpn/docker-compose.yml
+++ b/dockovpn/docker-compose.yml
@@ -10,8 +10,4 @@ services:
     # Environment variables: https://github.com/dockovpn/dockovpn#environment-variables
     volumes:
         - /docker/appdata/dockovpn/config:/opt/Dockovpn_data
-    restart: always
-networks:
- default:
-   name: "ubuntu-server"
-   external: true
\ No newline at end of file
+    restart: always
\ No newline at end of file
diff --git a/gotify/docker-compose.yml b/gotify/docker-compose.yml
index de7cf71..207087d 100644
--- a/gotify/docker-compose.yml
+++ b/gotify/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   gotify:
     container_name: gotify
@@ -9,8 +7,4 @@ services:
     ports:
       - 8085:80
     volumes:
-      - "/docker/appdata/gotify/data:/app/data"
-networks:
- default:
-   name: "ubuntu-server"
-   external: true
\ No newline at end of file
+      - "/docker/appdata/gotify/data:/app/data"
\ No newline at end of file
diff --git a/ollama/docker-compose.yml b/ollama/docker-compose.yml
index 9096e69..80263a2 100644
--- a/ollama/docker-compose.yml
+++ b/ollama/docker-compose.yml
@@ -7,4 +7,13 @@ services:
       - "11434:11434"
     restart: unless-stopped
     volumes:
-      - /home/isaac/Ollama:/root/.ollama
\ No newline at end of file
+      - /home/isaac/Ollama:/root/.ollama
+    networks:
+      - ollama-network
+networks:
+  default:
+    external:
+      name: ollama-network
+    driver: bridge
+    driver_opts:
+      com.docker.network.bridge.name: ollama-network
\ No newline at end of file
diff --git a/open-webui/docker-compose.yml b/open-webui/docker-compose.yml
index 654aa10..5bbd0ca 100644
--- a/open-webui/docker-compose.yml
+++ b/open-webui/docker-compose.yml
@@ -8,6 +8,10 @@ services:
     ports:
       - 9009:8080
     environment:
-      - 'OLLAMA_BASE_URL=http://127.0.0.1:11434'
+      - 'OLLAMA_BASE_URL=http://ollama-network:11434'
       # - 'WEBUI_SECRET_KEY=' Set this for jwt secret key. Should be rendomly generated at start
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped
+    networks:
+      - ollama-network
+    depends_on:
+      - ollama
\ No newline at end of file
diff --git a/terraria/docker-compose.yml b/terraria/docker-compose.yml
index ee8f817..737e386 100644
--- a/terraria/docker-compose.yml
+++ b/terraria/docker-compose.yml
@@ -12,8 +12,4 @@ services:
       - 7777:7777
     volumes:
       - /docker/appdata/terraria/worlds:/root/.local/share/Terraria/Worlds
-    restart: unless-stopped
-networks:
- default:
-   name: "ubuntu-server"
-   external: true
\ No newline at end of file
+    restart: unless-stopped
\ No newline at end of file