ivan/ansible
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

update docker compose

Browse Source
This commit is contained in:
ivan
2025-12-26 18:39:36 +10:00
parent d051cd19f3
commit 086dcaedbb
1 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
global/docker-compose.yml
View File

@@ -11,14 +11,10 @@ networks:
ipam: ipam:
config: config:
- subnet: 172.20.0.0/16 - subnet: 172.20.0.0/16
# wg_net:
# # Внешняявв сеть – интерфейс WireGuard
# external: true
# name: wg0
services: services:
synapse: synapse:
image: matrixdotorg/synapse:latest image: c5ada12052bb
networks: networks:
- npm - npm
container_name: matrix_synapse container_name: matrix_synapse
@@ -30,8 +26,9 @@ services:
- "8008:8008" - "8008:8008"
- "8448:8448" - "8448:8448"
volumes: volumes:
- ./synapse/data:/data - /opt/docker/synapse/data:/data
- ./mautrix:/briges - /opt/matrix:/media
- /opt/docker/mautrix:/briges
restart: unless-stopped restart: unless-stopped
drawio: drawio:
@@ -62,6 +59,7 @@ services:
- "8282:80" - "8282:80"
volumes: volumes:
- ./nginx-site:/usr/share/nginx/html:ro - ./nginx-site:/usr/share/nginx/html:ro
# - /opt/media:/user/share/nginx/media
restart: unless-stopped restart: unless-stopped
npm-app: npm-app:
@@ -109,7 +107,8 @@ services:
- USER_UID=1000 - USER_UID=1000
- USER_GID=1000 - USER_GID=1000
volumes: volumes:
- ./gitea/data:/data - /opt/docker/gitea/data:/data
- /opt/gitea/git:/data/git
ports: ports:
- "3000:3000" - "3000:3000"
- "2222:22" - "2222:22"
@@ -121,7 +120,7 @@ services:
- npm - npm
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./mautrix:/data - /opt/docker/mautrix:/data
environment: environment:
- TZ=Asia/Vladivostok - TZ=Asia/Vladivostok
ports: ports:
@@ -142,12 +141,12 @@ services:
ports: ports:
- "5000:5000" - "5000:5000"
volumes: volumes:
- ./registry/registry.password:/auth/registry.password - /opt/docker/registry/registry.password:/auth/registry.password
#- ./registry/certs:/certs #- ./registry/certs:/certs
- ./registry/data:/data - /opt/registry/data:/data
open-webui: open-webui:
image: ghcr.io/open-webui/open-webui:git-3111d1b-ollama image: ghcr.io/open-webui/open-webui:main
container_name: open-webui container_name: open-webui
networks: networks:
- npm - npm
@@ -160,12 +159,12 @@ services:
environment: environment:
- OLLAMA_BASE_URL=http://ollama:11434 - OLLAMA_BASE_URL=http://ollama:11434
volumes: volumes:
- ./open-webui:/app/backend/data - /opt/docker/open-webui:/app/backend/data
depends_on: depends_on:
- ollama - ollama
ollama: ollama:
image: ollama/ollama image: ollama/ollama:latest
container_name: ollama container_name: ollama
networks: networks:
- ollama_net - ollama_net
@@ -175,28 +174,12 @@ services:
ports: ports:
- "11434:11434" - "11434:11434"
volumes: volumes:
- ./ollama:/root/.ollama/ - /opt/ollama:/root/.ollama/
healthcheck: healthcheck:
test: ollama --version || exit 1 test: ollama --version || exit 1
#entrypoint: /root/entrypoint.sh #entrypoint: /root/entrypoint.sh
# wireguard:
# image: lscr.io/linuxserver/wireguard:latest
# container_name: wireguard_vpn
# # networks:
# # - npm
# cap_add:
# - NET_ADMIN
# - SYS_MODULE
# sysctls:
# - net.ipv4.conf.all.src_valid_mark=1
# ports:
# - "51820:51820/udp"
# volumes:
# - ./wireguard:/config
# restart: unless-stopped
volumes: volumes:
synapse_data: synapse_data:
npm_data: npm_data: