[IMP] Bump Doodba copier template to v9.6.1

Author: ljmnoonan

.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v9.4.1
+_commit: v9.6.1
 _src_path: gh:Tecnativa/doodba-copier-template
 backup_deletion: false
 backup_dst: boto3+s3://man18-backup
@@ -53,13 +53,44 @@ smtp_relay_port: 2525
 smtp_relay_user: manmanufacturing.com
 smtp_relay_version: latest
 traefik_version: 3
-use_refurb: false
+use_refurb: true
 whitelist_docker_project_devel: man18
+whitelist_docker_project_test: demo-man18-19
 whitelisted_hosts_devel:
   - cdnjs.cloudflare.com
   - fonts.googleapis.com
   - fonts.gstatic.com
   - www.google.com
   - www.googleapis.com
   - www.gravatar.com
-whitelisted_hosts_test: []
+whitelisted_hosts_test:
+  - accounts.google.com
+  - api.openrouteservice.org
+  - api.unsplash.com
+  - apis.google.com
+  - cdnjs.cloudflare.com
+  - download.geonames.org
+  - ec.europa.eu
+  - fonts.cdnfonts.com
+  - fonts.googleapis.com
+  - fonts.gstatic.com
+  - images.unsplash.com
+  - iap-services.odoo.com
+  - maps.googleapis.com
+  - media-api.odoo.com
+  - olg.api.odoo.com
+  - www.google.com
+  - www.googleapis.com
+  - www.gravatar.com
+  - undraw.co
+  - updates.maxmind.com
+  - www.ecb.europa.eu
+  - www.xe.com
+  - sis-t.redsys.es
+  - prewww1.aeat.es
+  - www2.agenciatributaria.gob.es
+  - www.openstreetmap.org
+  - nominatim.openstreetmap.org
+  - www.bizkaia.eus
+  - sii.araba.eus
+  - vies.api.odoo.com

.pre-commit-config.yaml

@@ -36,6 +36,11 @@ repos:
       - id: oca-checks-odoo-module
       - id: oca-checks-po
         args: ["--fix"]
+  - repo: https://github.com/dosisod/refurb
+    rev: v2.3.1
+    hooks:
+      - id: refurb
+        exclude: migrations/.*
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.13.0
     hooks:

README.md

@@ -1,5 +1,5 @@
 [![Doodba deployment](https://img.shields.io/badge/deployment-doodba-informational)](https://github.com/Tecnativa/doodba)
-[![Last template update](https://img.shields.io/badge/last%20template%20update-v9.4.1-informational)](https://github.com/Tecnativa/doodba-copier-template/tree/v9.4.1)
+[![Last template update](https://img.shields.io/badge/last%20template%20update-v9.6.1-informational)](https://github.com/Tecnativa/doodba-copier-template/tree/v9.6.1)
 [![Odoo](https://img.shields.io/badge/odoo-v19.0-a3478a)](https://github.com/odoo/odoo/tree/19.0)
 [![Deployment data](https://img.shields.io/badge/%F0%9F%8C%90%20prod-manmanufacturing.com-green)](http://manmanufacturing.com)
 [![Deployment data](https://img.shields.io/badge/%E2%9A%92%20demo-test.manmanufacturing.com-yellow)](http://test.manmanufacturing.com)

devel.yaml

@@ -71,16 +71,22 @@ services:
     environment:
       POSTGRES_DB: *dbname
       POSTGRES_PASSWORD: odoopassword
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -q -d $$POSTGRES_DB -U $$POSTGRES_USER"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   pgweb:
     image: docker.io/sosedoff/pgweb
     networks: *public
     ports:
       - "127.0.0.1:${PORT_PREFIX:-19}081:8081"
     environment:
-      DATABASE_URL: postgres://odoo:odoopassword@db:5432/devel?sslmode=disable
+      PGWEB_DATABASE_URL: postgres://odoo:odoopassword@db:5432/devel?sslmode=disable
     depends_on:
-      - db
+      db:
+        condition: service_healthy
 
   smtp:
     extends:
@@ -151,7 +157,7 @@ services:
       DNS_INTERNAL_FROM_DOCKER: "1"
       DOCKER_PROJECT: "${COMPOSE_PROJECT_NAME:-man18}"
       DOCKER_PRIMARY_SERVICE: "odoo"
-      ALLOWED_HOSTS: >-
+      ALLOWED_HOSTS: &proxy_allowed_hosts >-
         cdnjs.cloudflare.com fonts.googleapis.com fonts.gstatic.com www.google.com
         www.googleapis.com www.gravatar.com
 
@@ -168,9 +174,7 @@ services:
       public:
     environment:
       MODE_RUN: "gateway"
-      ALLOWED_HOSTS: >-
-        cdnjs.cloudflare.com fonts.googleapis.com fonts.gstatic.com www.google.com
-        www.googleapis.com www.gravatar.com
+      ALLOWED_HOSTS: *proxy_allowed_hosts
 networks:
   default:
     internal: ${DOODBA_NETWORK_INTERNAL-true}

migration.yaml

@@ -21,9 +21,11 @@ services:
     depends_on:
       - db
       - smtp
+      - proxy_general
     networks:
       default:
       globalwhitelist_shared:
+      whitelist:
     labels:
       doodba.domain.main: ""
     command:
@@ -62,6 +64,51 @@ services:
     command:
       - test -r /etc/mailhog/auth && export MH_AUTH_FILE=/etc/mailhog/auth; exec MailHog
 
+  odoo_net_setup:
+    image: ghcr.io/tecnativa/docker-whitelist-gateway-service:edge
+    network_mode: "service:odoo"
+    cap_add:
+      - NET_ADMIN
+    depends_on:
+      - odoo
+      - proxy_general
+    healthcheck:
+      disable: true
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      MODE_RUN: "net_setup"
+      GATEWAY_NAME: "proxy_general"
+      DNS_LOCAL: "1"
+      DNS_INTERNAL_FROM_DOCKER: "1"
+      DOCKER_PROJECT: "${COMPOSE_PROJECT_NAME:-demo-man18-19}"
+      DOCKER_PRIMARY_SERVICE: "odoo"
+      ALLOWED_HOSTS: &proxy_allowed_hosts >-
+        accounts.google.com api.openrouteservice.org api.unsplash.com apis.google.com
+        cdnjs.cloudflare.com download.geonames.org ec.europa.eu fonts.cdnfonts.com
+        fonts.googleapis.com fonts.gstatic.com images.unsplash.com iap-services.odoo.com
+        maps.googleapis.com media-api.odoo.com olg.api.odoo.com www.google.com
+        www.googleapis.com www.gravatar.com undraw.co updates.maxmind.com
+        www.ecb.europa.eu www.xe.com sis-t.redsys.es prewww1.aeat.es
+        www2.agenciatributaria.gob.es www.openstreetmap.org nominatim.openstreetmap.org
+        www.bizkaia.eus sii.araba.eus vies.api.odoo.com
+
+  proxy_general:
+    image: ghcr.io/tecnativa/docker-whitelist-gateway-service:edge
+    restart: unless-stopped
+    cap_add:
+      - NET_ADMIN
+    sysctls:
+      net.ipv4.ip_forward: "1"
+    networks:
+      whitelist:
+        aliases:
+          - proxy_general
+      public:
+    environment:
+      MODE_RUN: "gateway"
+      ALLOWED_HOSTS: *proxy_allowed_hosts
+
 networks:
   default:
     internal: ${DOODBA_NETWORK_INTERNAL-true}
@@ -73,6 +120,8 @@ networks:
 
   inverseproxy_shared:
     external: true
+  public:
+  whitelist:
 
 volumes:
   filestore: