Added Ollama network

This commit is contained in:
2025-09-22 19:19:44 +02:00
parent 4cb428274a
commit d129f71cef
3 changed files with 17 additions and 1 deletions

View File

@@ -1,5 +1,6 @@
{# This template needs to be included in docker-compose.yml #} {# This template needs to be included in docker-compose.yml #}
networks: networks:
{# Central RDMS-Database Network #}
{% if {% if
(applications | get_app_conf(application_id, 'features.central_database', False) and database_type is defined) or (applications | get_app_conf(application_id, 'features.central_database', False) and database_type is defined) or
application_id in ['svc-db-mariadb','svc-db-postgres'] application_id in ['svc-db-mariadb','svc-db-postgres']
@@ -7,6 +8,7 @@ networks:
{{ applications | get_app_conf('svc-db-' ~ database_type, 'docker.network') }}: {{ applications | get_app_conf('svc-db-' ~ database_type, 'docker.network') }}:
external: true external: true
{% endif %} {% endif %}
{# Central LDAP Network #}
{% if {% if
applications | get_app_conf(application_id, 'features.ldap', False) and applications | get_app_conf(application_id, 'features.ldap', False) and
applications | get_app_conf('svc-db-openldap', 'network.docker', False) applications | get_app_conf('svc-db-openldap', 'network.docker', False)
@@ -14,7 +16,13 @@ networks:
{{ applications | get_app_conf('svc-db-openldap', 'docker.network') }}: {{ applications | get_app_conf('svc-db-openldap', 'docker.network') }}:
external: true external: true
{% endif %} {% endif %}
{% if not application_id.startswith('svc-db-') %} {# Central AI Network #}
{% if applications | get_app_conf(application_id, 'features.local_ai', False) %}
{{ applications | get_app_conf('svc-ai-ollama', 'docker.network') }}:
external: true
{% endif %}
{# Default Network #}
{% if not application_id.startswith('svc-db-') and not application_id.startswith('svc-ai-') %}
default: default:
{% if {% if
application_id in networks.local and application_id in networks.local and

View File

@@ -1,3 +1,10 @@
- name: create docker network for Ollama, so that other applications can access it
community.docker.docker_network:
name: "{{ OLLAMA_NETWORK }}"
state: present
ipam_config:
- subnet: "{{ networks.local[application_id].subnet }}"
- name: Include dependency 'sys-svc-docker' - name: Include dependency 'sys-svc-docker'
include_role: include_role:
name: sys-svc-docker name: sys-svc-docker

View File

@@ -11,3 +11,4 @@ OLLAMA_IMAGE: "{{ applications | get_app_conf(application_id,
OLLAMA_CONTAINER: "{{ applications | get_app_conf(application_id, 'docker.services.ollama.name') }}" OLLAMA_CONTAINER: "{{ applications | get_app_conf(application_id, 'docker.services.ollama.name') }}"
OLLAMA_PORT: "{{ applications | get_app_conf(application_id, 'docker.services.ollama.port') }}" OLLAMA_PORT: "{{ applications | get_app_conf(application_id, 'docker.services.ollama.port') }}"
OLLAMA_VOLUME: "{{ applications | get_app_conf(application_id, 'docker.volumes.models') }}" OLLAMA_VOLUME: "{{ applications | get_app_conf(application_id, 'docker.volumes.models') }}"
OLLAMA_NETWORK: "{{ applications | get_app_conf(application_id, 'docker.network') }}"