From e48c4f883c859e7303231aa2d52fe4c66dd5f8cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@akretion.com>
Date: Fri, 4 Aug 2023 02:11:55 -0300
Subject: [PATCH 1/3] MAINTAINER is deprecated -> LABEL

---
 12.0/Dockerfile | 2 +-
 13.0/Dockerfile | 2 +-
 14.0/Dockerfile | 2 +-
 15.0/Dockerfile | 2 +-
 16.0/Dockerfile | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 93b60a8..0a308cb 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -1,5 +1,5 @@
 FROM ghcr.io/acsone/odoo-bedrock:12.0-py37-latest
-MAINTAINER Akretion
+LABEL maintainer=Akretion
 
 # syntax = docker/dockerfile:1.4
 
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
index b554051..a40e296 100644
--- a/13.0/Dockerfile
+++ b/13.0/Dockerfile
@@ -1,5 +1,5 @@
 FROM ghcr.io/acsone/odoo-bedrock:13.0-py37-latest
-MAINTAINER Akretion
+LABEL maintainer=Akretion
 
 # syntax = docker/dockerfile:1.4
 
diff --git a/14.0/Dockerfile b/14.0/Dockerfile
index 856d5dc..6fb0528 100644
--- a/14.0/Dockerfile
+++ b/14.0/Dockerfile
@@ -1,5 +1,5 @@
 FROM ghcr.io/acsone/odoo-bedrock:14.0-py38-latest
-MAINTAINER Akretion
+LABEL maintainer=Akretion
 
 # syntax = docker/dockerfile:1.4
 
diff --git a/15.0/Dockerfile b/15.0/Dockerfile
index 9050c77..45a71ae 100644
--- a/15.0/Dockerfile
+++ b/15.0/Dockerfile
@@ -1,5 +1,5 @@
 FROM ghcr.io/acsone/odoo-bedrock:15.0-py38-latest
-MAINTAINER Akretion
+LABEL maintainer=Akretion
 
 # syntax = docker/dockerfile:1.4
 
diff --git a/16.0/Dockerfile b/16.0/Dockerfile
index 53e3259..295fda4 100644
--- a/16.0/Dockerfile
+++ b/16.0/Dockerfile
@@ -1,6 +1,6 @@
 # python 3.10 is the default used in acsone
 FROM ghcr.io/acsone/odoo-bedrock:16.0-py310-latest
-MAINTAINER Akretion
+LABEL maintainer=Akretion
 
 # syntax = docker/dockerfile:1.4
 

From 9d4597595d698042fc1403fba6e41f096c6f9256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@akretion.com>
Date: Fri, 4 Aug 2023 02:14:17 -0300
Subject: [PATCH 2/3] English fixes

---
 bin/ak-entrypoint.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/ak-entrypoint.sh b/bin/ak-entrypoint.sh
index 18b6ce2..40a0738 100755
--- a/bin/ak-entrypoint.sh
+++ b/bin/ak-entrypoint.sh
@@ -15,7 +15,7 @@ export DB_NAME=${PGDATABASE}
 
 
 if [ -z "$(pip list --format=columns | grep "/odoo/src")" ]; then
-  # The build runs 'pip install -e' on the odoo src, which creates an
+  # The build runs 'pip install -e' on the odoo/src directory, which creates an
   # odoo.egg-info directory *inside /odoo/src*. So when we run a container
   # with a volume shared with the host, we don't have this .egg-info (at least
   # the first time).
@@ -30,7 +30,7 @@ if [ -z "$(pip list --format=columns | grep "/odoo/src")" ]; then
   chown -R $USER_ID:$USER_ID /odoo/src/*.egg-info
 fi
 
-# Do not block the entrypoint if the pip install fail (only local case)
-# so we only exist if fail after the pip install
+# Do not block the entrypoint if pip install fails (only local case)
+# so we only exit in case of a failure after pip install
 set -Eeuo pipefail
 /usr/local/bin/entrypoint.sh "$@"

From a78626e80c78b0613122fc341c6ac506aaf54fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@akretion.com>
Date: Fri, 4 Aug 2023 02:15:01 -0300
Subject: [PATCH 3/3] fix bad BUILD_RESTRICT_LANG test + English

---
 install/build-odoo | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/install/build-odoo b/install/build-odoo
index 07d95c7..7946b31 100755
--- a/install/build-odoo
+++ b/install/build-odoo
@@ -8,17 +8,16 @@ ak build -c odoo-spec.yaml -f odoo-frozen.yaml
 # Remove useless git directory
 rm -rf /odoo/src/.git
 
-# Keep only wanted odoo module if defined
+# First, we eventually keep only the wanted odoo modules
 if [ -z "$(ls -A /odoo/links)" ]; then
-  echo "No module specify, display all"
+  echo "No addons set specified, keeping all addons"
 else
   cp -r -L /odoo/links /odoo/odoo-addons
   rm -rf /odoo/src/addons/*
   mv /odoo/odoo-addons/* /odoo/src/addons
 fi
 
-# Secondly we remove unwanted lang
-if [[ BUILD_RESTRICT_LANG ]]
-then
+# Second, we remove unwanted lang
+if [[ -n "$BUILD_RESTRICT_LANG" ]]; then
     find /odoo/src/ -name *.po ! -name $BUILD_RESTRICT_LANG -type f -exec rm -v {} +
 fi