Merge branch 'dnapier-master'

Closes https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2180

roles/matrix-postgres/defaults/main.yml

@@ -29,7 +29,8 @@ matrix_postgres_docker_image_v11: "{{ matrix_container_global_registry_prefix }}
 matrix_postgres_docker_image_v12: "{{ matrix_container_global_registry_prefix }}postgres:12.12{{ matrix_postgres_docker_image_suffix }}"
 matrix_postgres_docker_image_v13: "{{ matrix_container_global_registry_prefix }}postgres:13.8{{ matrix_postgres_docker_image_suffix }}"
 matrix_postgres_docker_image_v14: "{{ matrix_container_global_registry_prefix }}postgres:14.5{{ matrix_postgres_docker_image_suffix }}"
-matrix_postgres_docker_image_latest: "{{ matrix_postgres_docker_image_v14 }}"
+matrix_postgres_docker_image_v15: "{{ matrix_container_global_registry_prefix }}postgres:15{{ matrix_postgres_docker_image_suffix }}"
+matrix_postgres_docker_image_latest: "{{ matrix_postgres_docker_image_v15 }}"
 
 # This variable is assigned at runtime. Overriding its value has no effect.
 matrix_postgres_docker_image_to_use: '{{ matrix_postgres_docker_image_latest }}'

roles/matrix-postgres/tasks/detect_existing_postgres_version.yml

@@ -68,3 +68,8 @@
   ansible.builtin.set_fact:
     matrix_postgres_detected_version_corresponding_docker_image: "{{ matrix_postgres_docker_image_v13 }}"
   when: "matrix_postgres_detected_version == '13' or matrix_postgres_detected_version.startswith('13.')"
+
+- name: Determine corresponding Docker image to detected version (use 14.x, if detected)
+  ansible.builtin.set_fact:
+    matrix_postgres_detected_version_corresponding_docker_image: "{{ matrix_postgres_docker_image_v14 }}"
+  when: "matrix_postgres_detected_version == '14' or matrix_postgres_detected_version.startswith('14.')"