From 690ab60699e4bfb66b4fe9dd43e2cf5c864e75ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Thu, 9 Nov 2023 16:36:53 +0100 Subject: [PATCH] Fix Dockerfile when using root on host root user should not be used to create container and oow should not be run as root. But when running oow in a docker, then the default user of this docker can be root. This fix allow to link the odoo user in the odoo environment docker to match a root user of the host docker. --- odoo_openupgrade_wizard/templates/odoo/11.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/12.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/13.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/14.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/15.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/16.0/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/odoo_openupgrade_wizard/templates/odoo/11.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/11.0/Dockerfile index 0992dbe..73c8130 100644 --- a/odoo_openupgrade_wizard/templates/odoo/11.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/11.0/Dockerfile @@ -55,6 +55,6 @@ RUN pip3 install --upgrade pip \ # Get local user id and set it to the odoo user ARG LOCAL_USER_ID -RUN useradd --uid $LOCAL_USER_ID odoo +RUN useradd --uid $LOCAL_USER_ID --non-unique odoo USER odoo diff --git a/odoo_openupgrade_wizard/templates/odoo/12.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/12.0/Dockerfile index 2d66854..f9e2c80 100644 --- a/odoo_openupgrade_wizard/templates/odoo/12.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/12.0/Dockerfile @@ -55,6 +55,6 @@ RUN pip3 install --upgrade pip \ # Get local user id and set it to the odoo user ARG LOCAL_USER_ID -RUN useradd --uid $LOCAL_USER_ID odoo +RUN useradd --uid $LOCAL_USER_ID --non-unique odoo USER odoo diff --git a/odoo_openupgrade_wizard/templates/odoo/13.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/13.0/Dockerfile index 12f76e8..d2935c3 100644 --- a/odoo_openupgrade_wizard/templates/odoo/13.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/13.0/Dockerfile @@ -51,6 +51,6 @@ RUN pip3 install --upgrade pip \ # Get local user id and set it to the odoo user ARG LOCAL_USER_ID -RUN useradd --uid $LOCAL_USER_ID odoo +RUN useradd --uid $LOCAL_USER_ID --non-unique odoo USER odoo diff --git a/odoo_openupgrade_wizard/templates/odoo/14.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/14.0/Dockerfile index cdd91b3..59751ee 100644 --- a/odoo_openupgrade_wizard/templates/odoo/14.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/14.0/Dockerfile @@ -44,6 +44,6 @@ RUN pip3 install --upgrade pip \ # Get local user id and set it to the odoo user ARG LOCAL_USER_ID -RUN useradd --uid $LOCAL_USER_ID odoo +RUN useradd --uid $LOCAL_USER_ID --non-unique odoo USER odoo diff --git a/odoo_openupgrade_wizard/templates/odoo/15.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/15.0/Dockerfile index 2c44e64..f5d3860 100644 --- a/odoo_openupgrade_wizard/templates/odoo/15.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/15.0/Dockerfile @@ -44,6 +44,6 @@ RUN pip3 install --upgrade pip \ # Get local user id and set it to the odoo user ARG LOCAL_USER_ID -RUN useradd --uid $LOCAL_USER_ID odoo +RUN useradd --uid $LOCAL_USER_ID --non-unique odoo USER odoo diff --git a/odoo_openupgrade_wizard/templates/odoo/16.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/16.0/Dockerfile index b4a4b53..6779c90 100644 --- a/odoo_openupgrade_wizard/templates/odoo/16.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/16.0/Dockerfile @@ -44,6 +44,6 @@ RUN pip3 install --upgrade pip \ # Get local user id and set it to the odoo user ARG LOCAL_USER_ID -RUN useradd --uid $LOCAL_USER_ID odoo +RUN useradd --uid $LOCAL_USER_ID --non-unique odoo USER odoo