Add PostgreSQL 18 (#6144)

README.md

@@ -129,10 +129,11 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re
     Choose from 1, 2, 3 [1]: 1
     use_docker [n]: n
     Select postgresql_version:
-    1 - 17
-    2 - 16
-    3 - 15
-    4 - 14
+    1 - 18
+    2 - 17
+    3 - 16
+    4 - 15
+    5 - 14
     Choose from 1, 2, 3, 4 [1]: 1
     Select cloud_provider:
     1 - AWS

cookiecutter.json

@@ -18,7 +18,7 @@
   "windows": "n",
   "editor": ["None", "PyCharm", "VS Code"],
   "use_docker": "n",
-  "postgresql_version": ["17", "16", "15", "14"],
+  "postgresql_version": ["18", "17", "16", "15", "14"],
   "cloud_provider": ["AWS", "GCP", "Azure", "None"],
   "mail_service": [
     "Mailgun",

docs/1-getting-started/project-generation-options.rst

@@ -66,10 +66,11 @@ use_docker:
 postgresql_version:
     Select a PostgreSQL_ version to use. The choices are:
 
-    1. 17
-    2. 16
-    3. 15
-    4. 14
+    1. 18
+    2. 17
+    3. 16
+    4. 15
+    5. 14
 
 cloud_provider:
     Select a cloud provider for static & media files. The choices are:

tests/test_cookiecutter_generation.py

@@ -60,6 +60,7 @@ SUPPORTED_COMBINATIONS = [
     {"editor": "VS Code"},
     {"use_docker": "y"},
     {"use_docker": "n"},
+    {"postgresql_version": "18"},
     {"postgresql_version": "17"},
     {"postgresql_version": "16"},
     {"postgresql_version": "15"},

{{cookiecutter.project_slug}}/docker-compose.local.yml

@@ -35,7 +35,11 @@ services:
     image: {{ cookiecutter.project_slug }}_production_postgres
     container_name: {{ cookiecutter.project_slug }}_local_postgres
     volumes:
+      {%- if cookiecutter.postgresql_version|int >= 18 %}
+      - {{ cookiecutter.project_slug }}_local_postgres_data:/var/lib/postgresql/{{ cookiecutter.postgresql_version }}/docker
+      {%- else %}
       - {{ cookiecutter.project_slug }}_local_postgres_data:/var/lib/postgresql/data
+      {%- endif %}
       - {{ cookiecutter.project_slug }}_local_postgres_data_backups:/backups
     env_file:
       - ./.envs/.local/.postgres

{{cookiecutter.project_slug}}/docker-compose.production.yml

@@ -47,7 +47,11 @@ services:
       dockerfile: ./compose/production/postgres/Dockerfile
     image: {{ cookiecutter.project_slug }}_production_postgres
     volumes:
+      {%- if cookiecutter.postgresql_version|int >= 18 %}
+      - production_postgres_data:/var/lib/postgresql/{{ cookiecutter.postgresql_version }}/docker
+      {%- else %}
       - production_postgres_data:/var/lib/postgresql/data
+      {%- endif %}
       - production_postgres_data_backups:/backups
     env_file:
       - ./.envs/.production/.postgres