diff --git a/docker-compose/examples/grafana/docker-compose.yml b/docker-compose/examples/grafana/docker-compose.yml index 21f7718..73bfe39 100644 --- a/docker-compose/examples/grafana/docker-compose.yml +++ b/docker-compose/examples/grafana/docker-compose.yml @@ -53,4 +53,4 @@ networks: ipam: driver: default config: - # - subnet: 172.21.184.0/24 + - subnet: ${SUBNET} diff --git a/docker-compose/examples/grafana/env/fqdn_context.env.example b/docker-compose/examples/grafana/env/fqdn_context.env.example index e7d7042..cfec8dd 100644 --- a/docker-compose/examples/grafana/env/fqdn_context.env.example +++ b/docker-compose/examples/grafana/env/fqdn_context.env.example @@ -25,6 +25,16 @@ CONTEXT=cncf +# Subnet to use for this Docker Compose project. Docker defaults to +# container networks in prefix 172.16.0.0/12 which is 1 million addresses in +# the range from 172.16.0.0 to 172.31.255.255. Docker uses 172.17.0.0/16 for +# itself. Use any sensible prefix in 172.16.0.0/12 here except for Docker's +# own 172.17.0.0/16. +# --- +SUBNET=172.30.95.0/24 + + + # See 'docker-compose.override.yml' for how to make a variable available in # a Dockerfile # --- diff --git a/docker-compose/examples/hashicorpvault/docker-compose.yml b/docker-compose/examples/hashicorpvault/docker-compose.yml index 6e0ecf9..0d917e1 100644 --- a/docker-compose/examples/hashicorpvault/docker-compose.yml +++ b/docker-compose/examples/hashicorpvault/docker-compose.yml @@ -25,4 +25,4 @@ networks: ipam: driver: default config: - # - subnet: 172.21.184.0/24 + - subnet: ${SUBNET} diff --git a/docker-compose/examples/hashicorpvault/env/fqdn_context.env.example b/docker-compose/examples/hashicorpvault/env/fqdn_context.env.example index 7604081..b43af71 100644 --- a/docker-compose/examples/hashicorpvault/env/fqdn_context.env.example +++ b/docker-compose/examples/hashicorpvault/env/fqdn_context.env.example @@ -24,6 +24,16 @@ CONTEXT=fsf +# Subnet to use for this Docker Compose project. Docker defaults to +# container networks in prefix 172.16.0.0/12 which is 1 million addresses in +# the range from 172.16.0.0 to 172.31.255.255. Docker uses 172.17.0.0/16 for +# itself. Use any sensible prefix in 172.16.0.0/12 here except for Docker's +# own 172.17.0.0/16. +# --- +SUBNET=172.30.95.0/24 + + + # See 'docker-compose.override.yml' for how to make a variable available in # a Dockerfile # --- diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml b/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml index e4ce915..9f203e8 100644 --- a/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml +++ b/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml @@ -70,4 +70,4 @@ networks: ipam: driver: default config: - # - subnet: 172.21.184.0/24 + - subnet: ${SUBNET} diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/env/fqdn_context.env.example b/docker-compose/{{ cookiecutter.__project_slug }}/env/fqdn_context.env.example index 969b44a..78f62a3 100644 --- a/docker-compose/{{ cookiecutter.__project_slug }}/env/fqdn_context.env.example +++ b/docker-compose/{{ cookiecutter.__project_slug }}/env/fqdn_context.env.example @@ -31,6 +31,16 @@ CONTEXT={{ cookiecutter.__context_slug }} +# Subnet to use for this Docker Compose project. Docker defaults to +# container networks in prefix 172.16.0.0/12 which is 1 million addresses in +# the range from 172.16.0.0 to 172.31.255.255. Docker uses 172.17.0.0/16 for +# itself. Use any sensible prefix in 172.16.0.0/12 here except for Docker's +# own 172.17.0.0/16. +# --- +SUBNET=172.30.95.0/24 + + + # See 'docker-compose.override.yml' for how to make a variable available in # a Dockerfile # ---