From f9e25c187f74994e7ddfdaf660c8fd147bc34960 Mon Sep 17 00:00:00 2001 From: Henrik Norlin Date: Tue, 4 Jun 2024 08:12:01 +0000 Subject: [PATCH 1/5] [IMP] doodba-copier-template: domains_prod and domains_test --- copier.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/copier.yml b/copier.yml index 3bfd7b6f..6cf0c4d0 100644 --- a/copier.yml +++ b/copier.yml @@ -214,8 +214,12 @@ gitlab_url: domains_prod: type: yaml multiline: true - default: {} + default: null placeholder: | + - hosts: + - www.main.com + - shop.main.com + examples: | # Main domains, with TLS and cert resolved with "letsencrypt" resolver - hosts: - www.main.com @@ -270,8 +274,12 @@ domains_prod: domains_test: type: yaml multiline: true - default: {} + default: null placeholder: | + - hosts: + - demo1.main.com + - demo2.main.com + examples: | # Main domains, with TLS and cert resolved with "letsencrypt" resolver - hosts: - demo1.main.com From 58657374df01dc8651896f3d269e464f8be6c6fc Mon Sep 17 00:00:00 2001 From: Henrik Norlin Date: Tue, 4 Jun 2024 09:08:24 +0000 Subject: [PATCH 2/5] [IMP] doodba-copier-template: removed duplicate lines --- copier.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/copier.yml b/copier.yml index 6cf0c4d0..dcb9d1ac 100644 --- a/copier.yml +++ b/copier.yml @@ -219,12 +219,8 @@ domains_prod: - hosts: - www.main.com - shop.main.com - examples: | # Main domains, with TLS and cert resolved with "letsencrypt" resolver - - hosts: - - www.main.com - - shop.main.com - + examples: | # Alternate domains that redirect to main ones - hosts: - main.com @@ -279,12 +275,8 @@ domains_test: - hosts: - demo1.main.com - demo2.main.com - examples: | # Main domains, with TLS and cert resolved with "letsencrypt" resolver - - hosts: - - demo1.main.com - - demo2.main.com - + examples: | # Alternate domains that redirect to main ones - hosts: - www.demo1.main.com From 108d45d167e82bde18b5be90eb342381b1be7ee7 Mon Sep 17 00:00:00 2001 From: Henrik Norlin Date: Thu, 6 Jun 2024 07:13:14 +0200 Subject: [PATCH 3/5] [IMP] doodba-copier-template: FAQ inverseproxy/docker-compose.yaml Inside a directory named 'inverseproxy', the 'shared' network will be named 'inverseproxy_shared'. --- docs/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.md b/docs/faq.md index 213fc38b..3d04487a 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -179,7 +179,7 @@ This is needed for testing and production environments to be reachable. Our supported proxy is Traefik. There must be one in each node. -To have it, use this `inverseproxy.yaml` file: +To have it, use this `inverseproxy/docker-compose.yaml` file:
Traefik v1 docker compose From a87396a0ff0fb0fc0929dd884ffda260ecb95c34 Mon Sep 17 00:00:00 2001 From: Henrik Norlin Date: Thu, 6 Jun 2024 09:05:21 +0200 Subject: [PATCH 4/5] [IMP] doodba-invoke-template: copier copy --trust --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 455f54e2..056cb6a1 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ pipx ensurepath Once you installed everything, you can now use Copier to copy this template: ```bash -copier copy gh:Tecnativa/doodba-copier-template ~/path/to/your/subproject +copier copy gh:Tecnativa/doodba-copier-template ~/path/to/your/subproject --trust ``` Copier will ask you a lot of questions. Answer them to properly generate the template. From f6012fbe910e791a49394ed3e2e5b52ab738f4c6 Mon Sep 17 00:00:00 2001 From: Henrik Norlin Date: Tue, 11 Jun 2024 10:52:23 +0200 Subject: [PATCH 5/5] [IMP] doodba-copier-template: postgres 16 --- copier.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/copier.yml b/copier.yml index dcb9d1ac..d29389f8 100644 --- a/copier.yml +++ b/copier.yml @@ -349,7 +349,7 @@ cidr_whitelist: ⚠️ It must be a list. And this is only supported if you deploy with Traefik 2+. postgres_version: - default: "15" + default: "16" help: >- Which PostgreSQL version do you want to deploy? (Recommended: for new instances always use the latest version. Version 9.6 has no backup support.) @@ -362,6 +362,7 @@ postgres_version: "13": "13" "14": "14" "15": "15" + "16": "16" validator: >- {% if postgres_version|int > 0 %} {% if (odoo_version >= 16.0 and postgres_version|int < 12) or (odoo_version >= 14.0 and postgres_version|int < 10)