diff --git a/roles/docker/tasks/services.yml b/roles/docker/tasks/services.yml index 09d9a36..2f95cfc 100644 --- a/roles/docker/tasks/services.yml +++ b/roles/docker/tasks/services.yml @@ -28,8 +28,8 @@ docker_network: name: services ipam_config: - - subnet: 172.17.0.0/16 - gateway: 172.17.0.1 + - subnet: 172.16.0.0/16 + gateway: 172.16.0.1 state: present - name: Deploy services diff --git a/roles/docker/tasks/services/caddy.yml b/roles/docker/tasks/services/caddy.yml index 72e3582..769c1f5 100644 --- a/roles/docker/tasks/services/caddy.yml +++ b/roles/docker/tasks/services/caddy.yml @@ -25,7 +25,7 @@ image: "caddy:{{ services.caddy.version }}" restart_policy: unless-stopped networks: - - services + - name: services volumes: - "{{ services.caddy.volume }}/Caddyfile:/etc/caddy/Caddyfile:ro" - "{{ services.caddy.volume }}/config:/config:rw" diff --git a/roles/docker/tasks/services/emby.yml b/roles/docker/tasks/services/emby.yml index 3942dbd..8ba8a82 100644 --- a/roles/docker/tasks/services/emby.yml +++ b/roles/docker/tasks/services/emby.yml @@ -22,7 +22,7 @@ UID: '1000' GID: '1000' networks: - - services + - name: services volumes: - "{{ services.emby.volume }}/programdata:/config:rw" - "{{ services.emby.volume }}/tvshows:/mnt/share1:rw" diff --git a/roles/docker/tasks/services/monerod.yml b/roles/docker/tasks/services/monerod.yml index c406066..acae598 100644 --- a/roles/docker/tasks/services/monerod.yml +++ b/roles/docker/tasks/services/monerod.yml @@ -11,7 +11,7 @@ image: "sethsimmons/simple-monerod:{{ services.monerod.version }}" restart_policy: unless-stopped networks: - - services + - name: services volumes: - monerod-node-blockchain:/home/monero/.bitmonero:rw published_ports: diff --git a/roles/docker/templates/daemon.json.j2 b/roles/docker/templates/daemon.json.j2 index de7efe6..ce3b976 100644 --- a/roles/docker/templates/daemon.json.j2 +++ b/roles/docker/templates/daemon.json.j2 @@ -1,5 +1,11 @@ { "data-root": "{{ ssd_mount_point }}/docker-runtime", + "default-address-pools": [ + { + "base": "172.17.0.0/16", + "size": 24 + } + ], "ipv6": true, "fixed-cidr-v6": "fd00::/80" }