From 0fd7ce72c061db458d2a5308392e6d0e508ceb6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Ba=C3=B1=C3=B3n?= <david.banon@tecnativa.com>
Date: Fri, 2 Oct 2026 08:31:18 +0200
Subject: [PATCH 1/2] [CHORE] Improve docker bake config

---
 docker-bake.hcl | 48 +++++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 5ea2594c..6ce6f79d 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,20 +1,21 @@
 variable "IMAGE_NAME" {
-  default = "tecnativa/doodba"
+    default = "tecnativa/doodba"
 }
 variable "VERSIONS" {
-  default = ["11.0", "12.0", "13.0","14.0","15.0","16.0","17.0","18.0","19.0","20.0"]
+    type = list(string)
+    default = ["11.0", "12.0", "13.0","14.0","15.0","16.0","17.0","18.0","19.0","20.0"]
 }
-variable "SUFFIX" {
- default = ""
+variable "TAG_SUFFIX" {
+    default = ""
 }
 variable "VARIANTS" {
-  default = ["base", "onbuild"]
+    default = [{"target":"base", "tag":""}, {"target": "onbuild", "tag":"-onbuild"}]
 }
 variable "CI_SKIP_VERSIONS" {
     default = ["11.0","12.0"]
 }
 group "default" {
-  targets = [
+    targets = [
     "onbuild-${ODOO_VERSION}",
     "base-${ODOO_VERSION}"
   ]
@@ -25,33 +26,38 @@ variable "ODOO_VERSION" {
 variable "PLATFORMS" {
     default = ""
 }
+variable "REGISTRIES" {
+    default = ["ghcr.io","docker.io"]
+}
 group "all" {
-  targets = flatten([
+    targets = flatten([
     for version in VERSIONS : [
       for variant in VARIANTS :
-        "${variant}-${replace(version, ".0", "")}"
+        "${variant.target}-${replace(version, ".0", "")}"
     ]
   ])
 }
 
 group "ci" {
-  targets = flatten([
+    targets = flatten([
     for version in setsubtract(VERSIONS, CI_SKIP_VERSIONS) : [
       for variant in VARIANTS :
-        "${variant}-${replace(version, ".0", "")}"
+        "${variant.target}-${replace(version, ".0", "")}"
     ]
   ])
 }
 target "doodba" {
-  matrix = {
-    version = VERSIONS
-    variant = ["base", "onbuild"]
-  }
-  name = "${variant}-${replace(version, ".0", "")}"
-  tags = [
-    "${IMAGE_NAME}:${version}-${variant}${SUFFIX}"
-  ]
-  context = "."
-  dockerfile = "${version}.Dockerfile"
-  platforms = split(",", PLATFORMS)
+    matrix = {
+        version = VERSIONS
+        variant = VARIANTS
+    }
+    name = "${variant.target}-${replace(version, ".0", "")}"
+    tags = [
+    for registry in REGISTRIES :
+        "${registry}/${IMAGE_NAME}:${version}${variant.tag}${TAG_SUFFIX}"
+    ]
+    target = variant.target
+    context = "."
+    dockerfile = "${version}.Dockerfile"
+    platforms = split(",", PLATFORMS)
 }

From 75bf01995e12d4197b11b5c323c452bba709863f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Ba=C3=B1=C3=B3n?= <david.banon@tecnativa.com>
Date: Fri, 2 Oct 2026 08:32:46 +0200
Subject: [PATCH 2/2] [FIX] 15.0: Postgres apt repo was moved to archive

---
 15.0.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/15.0.Dockerfile b/15.0.Dockerfile
index 3ee70b19..422ef415 100644
--- a/15.0.Dockerfile
+++ b/15.0.Dockerfile
@@ -79,7 +79,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,id=apt-lists-${TARGETARCH}-${OD
         telnet \
         tk-dev \
         vim \
-    && echo 'deb https://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/postgresql.list \
+    && echo 'deb https://apt-archive.postgresql.org/pub/repos/apt bullseye-pgdg main' >> /etc/apt/sources.list.d/postgresql.list \
     && curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
     && apt-get update \
     && curl --silent -L --output /tmp/geoipupdate_${GEOIP_UPDATER_VERSION}_linux_${TARGETARCH}.deb https://github.com/maxmind/geoipupdate/releases/download/v${GEOIP_UPDATER_VERSION}/geoipupdate_${GEOIP_UPDATER_VERSION}_linux_${TARGETARCH}.deb \