Use network name as TLD in domain names

Set a network name that is safe to use as a TLD.
liip · Oct 24, 2024 · 47b914f · 47b914f
1 parent d3699be
commit 47b914f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/cookiecutter.json b/cookiecutter.json
@@ -1,6 +1,7 @@
 {
   "project_name": "My Project",
   "project_slug": "{{ cookiecutter.project_name|lower|replace(' ', '_')|replace('-', '_') }}",
+  "__network_name": "{{ cookiecutter.project_slug|replace('_', '') }}",
   "jira_prefix": "",
   "virtualization_tool": ["docker", "nothing"],
   "override_user_model": "y",

diff --git a/{{cookiecutter.project_slug}}/docker-compose.override.example.yml b/{{cookiecutter.project_slug}}/docker-compose.override.example.yml
@@ -1,4 +1,5 @@
-{% set subdomain = cookiecutter.project_slug|replace("_", "-") %}# Docker-compose override examples
+{% set subdomain = cookiecutter.project_slug|replace("_", "-") -%}
+# Docker-compose override examples
 # ================================
 #
 # Make a copy of this file and name it `docker-compose.override.yml`, then
@@ -41,6 +42,7 @@
 #   JIRA_USERNAME: username
 #   JIRA_PASSWORD: password
 #   JIRA_URL: https://jira.liip.ch
+#
 # x-build-args: &x-build-args
 #  USER_ID: 1000   # Change this if your host user is not 1000
 #  GROUP_ID: 1000  # Change this if your host group is not 1000
@@ -103,6 +105,7 @@
 #       - 'traefik.http.routers.{{ cookiecutter.project_slug }}_mailhog.middlewares=https_redirect@file'
 #       - 'traefik.http.routers.{{ cookiecutter.project_slug }}_mailhog.rule=Host(`{{ subdomain }}-mail.docker.test`)'
 #       - 'traefik.http.services.{{ cookiecutter.project_slug }}_mailhog.loadbalancer.server.port=8025'
+#
 # networks:
 #   pontsun:
 #     external: true
diff --git a/{{cookiecutter.project_slug}}/docker-compose.yml b/{{cookiecutter.project_slug}}/docker-compose.yml
@@ -1,3 +1,4 @@
+{% set network_name = cookiecutter.project_slug|replace("_", "") -%}
 x-environment:
   &x-environment
   INITIAL: "${INITIAL:-0}"
@@ -19,8 +20,8 @@ services:
       <<: *x-environment
       ALLOWED_HOSTS: >-
         localhost
-      DATABASE_URL: postgresql://postgres:{{ cookiecutter.project_slug }}@db/{{ cookiecutter.project_slug }}
-      EMAIL_URL: smtp://mailhog:1025
+      DATABASE_URL: postgresql://postgres:{{ cookiecutter.project_slug }}@db.{{ cookiecutter.__network_name }}/{{ cookiecutter.project_slug }}
+      EMAIL_URL: smtp://mailhog.{{ cookiecutter.__network_name }}:1025
       MEDIA_ROOT: /opt/media
     volumes:
       - media:/opt/media
@@ -42,6 +43,11 @@ services:
       <<: *x-environment
   mailhog:
     image: mailhog/mailhog:v1.0.1
+
+networks:
+  default:
+    name: {{ cookiecutter.__network_name }}
+
 volumes:
   media:
   pgdata: