Merge branch 'FIX-use-correct-dockerfiles' into 'main'

[ADD] 11.0 docker file : Add Dockerfile, based on...

See merge request odoo-openupgrade-wizard/odoo-openupgrade-wizard!23

DEVELOP.md

@@ -121,6 +121,29 @@ Also this project is inspired by the following tools:
 * click-odoo-contrib (https://github.com/acsone/click-odoo-contrib)
 
 
+# Dockerfile information
+
+### From version 5 to 7
+
+There are no plans to make the tool work for these versions.
+
+### From version 8 to 10 (Python2)
+
+Try to create dockerfile, based on the odoo official ones fails. Any help welcome.
+
+### From version 11.0 to latest version. (Python3)
+
+The Dockerfile of the version 11 to the lastest version of Odoo are written this way :
+
+- Copy the content of https://github.com/odoo/odoo/blob/ODOO_VERSION/setup/package.dfsrc
+- remove all the part after the big ``apt-get install``
+- install debian package ``git`` to have the possibility to pip install from git url.
+- install custom debian packages
+- install python odoo requirements
+- install python ``setuptools-scm`` lib to have the possibility to pip install ``openupgradelib`` from git url.
+- install python custom requirements
+- makes link between external user and docker odoo user
+
 ## Réferences
 
 - how to install gitlab runner locally:
@@ -140,9 +163,15 @@ This part can help you if you want to change your autogenerated Dockerfiles.
 
 See (https://github.com/odoo/odoo/blob/ODOO_VERSION/setup/package.dfdebian)
 
+### debian:wheezy (V7) (for Odoo: 8.0)
+- Ubuntu release : 12.04 xxx, 12.10 xxx, 13.04 xxx, 14.10 xxx
+- python2.7
+- First release : 04/05/2013
+- End LTS : May 2018
+
 ### debian:jessie (V8) (for Odoo: 9.0, 10.0)
 - Ubuntu release : 14.04 trusty, 14.10 utopic, 15.04 vivid, 15.10 wily
-- python2.7 and ???
+- python2.7
 - First release : 26/04/2015
 - End LTS : June 2020
 

odoo_openupgrade_wizard/templates/odoo/11.0/Dockerfile

@@ -0,0 +1,56 @@
+# <OOW> : Copy of https://github.com/odoo/odoo/blob/11.0/setup/package.dfsrc
+FROM debian:stretch
+
+RUN apt-get update && \
+    apt-get install -y locales && \
+    rm -rf /var/lib/apt/lists/*
+
+# Reconfigure locales such that postgresql uses UTF-8 encoding
+RUN dpkg-reconfigure locales && \
+    locale-gen C.UTF-8 && \
+    /usr/sbin/update-locale LANG=C.UTF-8
+ENV LC_ALL C.UTF-8
+
+RUN apt-get update -qq &&  \
+    apt-get upgrade -qq -y && \
+    apt-get install \
+        postgresql \
+        postgresql-server-dev-all \
+        postgresql-client \
+        adduser \
+        node-less \
+        libxml2-dev \
+        libxslt1-dev \
+        libldap2-dev \
+        libsasl2-dev \
+        libssl-dev \
+        libjpeg-dev \
+        zlib1g-dev \
+        python3-dev \
+        python3-pip \
+        python3-wheel \
+        build-essential \
+        python3 -y && \
+    rm -rf /var/lib/apt/lists/*
+
+# <OOW> Install Debian packages
+COPY extra_debian_requirements.txt /extra_debian_requirements.txt
+RUN apt-get update -qq \
+    && apt-get install -y git \
+    && xargs apt-get install -y --no-install-recommends <extra_debian_requirements.txt \
+    && rm -rf /var/lib/apt/lists/*
+
+# <OOW> Install Python librairies
+COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt
+COPY extra_python_requirements.txt /extra_python_requirements.txt
+RUN pip3 install --upgrade pip \
+    && python3 -m pip install --no-cache-dir setuptools-scm \
+    && python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt \
+    && python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt
+
+# <OOW> Get local user id and set it to the odoo user
+ARG LOCAL_USER_ID
+
+RUN useradd --uid $LOCAL_USER_ID odoo
+
+USER odoo

odoo_openupgrade_wizard/templates/odoo/12.0/Dockerfile

@@ -1,72 +1,54 @@
-# <OOW> : Copy of https://github.com/odoo/odoo/blob/12.0/setup/package.dfdebian
+# <OOW> : Copy of https://github.com/odoo/odoo/blob/12.0/setup/package.dfsrc
-
 FROM debian:stretch
 
-# 1. <OOW> Official Odoo Dockerfile.
+RUN apt-get update && \
-# Removing: postgresql, locales, rsync
+    apt-get install -y locales && \
+    rm -rf /var/lib/apt/lists/*
 
-ENV DEBIAN_FRONTEND noninteractive
+# Reconfigure locales such that postgresql uses UTF-8 encoding
+RUN dpkg-reconfigure locales && \
+    locale-gen C.UTF-8 && \
+    /usr/sbin/update-locale LANG=C.UTF-8
+ENV LC_ALL C.UTF-8
 
 RUN apt-get update -qq &&  \
     apt-get upgrade -qq -y && \
-    apt-get install -yq \
+    apt-get install \
-        adduser \
+        postgresql \
-        dh-python \
+        postgresql-server-dev-all \
-        packaging-dev \
         postgresql-client \
-        python3 \
+        adduser \
-        python3-babel \
+        libsass0 \
-        python3-dateutil \
+        libxml2-dev \
-        python3-decorator \
+        libxslt1-dev \
-        python3-docutils \
+        libldap2-dev \
-        python3-gevent \
+        libsasl2-dev \
-        python3-html2text \
+        libssl-dev \
-        python3-pil \
+        libjpeg-dev \
-        python3-jinja2 \
+        zlib1g-dev \
-        python3-libsass \
+        python3-dev \
-        python3-lxml \
+        python3-pip \
-        python3-mako \
+        python3-wheel \
-        python3-mock \
+        build-essential \
-        python3-ofxparse \
+        python3 -y && \
-        python3-passlib \
+    rm -rf /var/lib/apt/lists/*
-        python3-psutil \
-        python3-psycopg2 \
-        python3-pydot \
-        python3-pyparsing \
-        python3-pypdf2 \
-        python3-reportlab \
-        python3-requests \
-        python3-serial \
-        python3-suds \
-        python3-tz \
-        python3-usb \
-        python3-vatnumber \
-        python3-vobject \
-        python3-werkzeug \
-        python3-xlsxwriter \
-    && rm -rf /var/lib/apt/lists/*
 
-# 2. <OOW> Add 2 python dependency files and 1 debian dependency file
+# <OOW> Install Debian packages
-
-COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt
-COPY extra_python_requirements.txt /extra_python_requirements.txt
 COPY extra_debian_requirements.txt /extra_debian_requirements.txt
-
+RUN apt-get update -qq \
-# 3. <OOW> Install Debian packages
+    && apt-get install -y git \
-RUN apt-get update || true \
-    && apt-get install -y\
-    # <OOW> To allow to run pip install
-    python3-pip\
-    # <OOW> For python-ldap
-    libldap2-dev ldap-utils libsasl2-dev\
     && xargs apt-get install -y --no-install-recommends <extra_debian_requirements.txt \
     && rm -rf /var/lib/apt/lists/*
 
-# 4. <OOW> Install Python librairies
+# <OOW> Install Python librairies
-RUN python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt
+COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt
-RUN python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt
+COPY extra_python_requirements.txt /extra_python_requirements.txt
+RUN pip3 install --upgrade pip \
+    && python3 -m pip install --no-cache-dir setuptools-scm \
+    && python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt \
+    && python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt
 
-# 5. <OOW> Get local user id and set it to the odoo user
+# <OOW> Get local user id and set it to the odoo user
 ARG LOCAL_USER_ID
 
 RUN useradd --uid $LOCAL_USER_ID odoo

odoo_openupgrade_wizard/templates/odoo/13.0/Dockerfile

@@ -1,76 +1,54 @@
-# <OOW> : Copy of https://github.com/odoo/odoo/blob/13.0/setup/package.dfdebian
+# <OOW> : Copy of https://github.com/odoo/odoo/blob/13.0/setup/package.dfsrc
-
 FROM debian:buster
 
-# 1. <OOW> Official Odoo Dockerfile.
+RUN apt-get update && \
-# Removing: postgresql, locales, rsync
+    apt-get install -y locales && \
+    rm -rf /var/lib/apt/lists/*
 
-ENV DEBIAN_FRONTEND noninteractive
+# Reconfigure locales such that postgresql uses UTF-8 encoding
+RUN dpkg-reconfigure locales && \
+    locale-gen C.UTF-8 && \
+    /usr/sbin/update-locale LANG=C.UTF-8
+ENV LC_ALL C.UTF-8
 
 RUN apt-get update -qq &&  \
     apt-get upgrade -qq -y && \
-    apt-get install -qq -y\
+    apt-get install \
-        adduser \
+        postgresql \
-        dh-python \
+        postgresql-server-dev-all \
-        packaging-dev \
         postgresql-client \
-        python3 \
+        adduser \
-        python3-babel \
+        libsass1 \
-        python3-dateutil \
+        libxml2-dev \
-        python3-decorator \
+        libxslt1-dev \
-        python3-docutils \
+        libldap2-dev \
-        python3-gevent \
+        libsasl2-dev \
-        python3-pil \
+        libssl-dev \
-        python3-jinja2 \
+        libjpeg-dev \
-        python3-libsass \
+        zlib1g-dev \
-        python3-lxml \
+        python3-dev \
-        python3-mako \
+        python3-pip \
-        python3-mock \
+        python3-wheel \
-        python3-ofxparse \
+        build-essential \
-        python3-passlib \
+        python3 -y && \
-        python3-polib \
+    rm -rf /var/lib/apt/lists/*
-        python3-psutil \
-        python3-psycopg2 \
-        python3-pydot \
-        python3-pyparsing \
-        python3-pypdf2 \
-        python3-qrcode \
-        python3-renderpm \
-        python3-reportlab \
-        python3-requests \
-        python3-serial \
-        python3-tz \
-        python3-usb \
-        python3-vatnumber \
-        python3-vobject \
-        python3-werkzeug \
-        python3-xlsxwriter \
-        python3-zeep \
-    && rm -rf /var/lib/apt/lists/*
 
-# 2. <OOW> Add 2 python dependency files and 1 debian dependency file
+# <OOW> Install Debian packages
-
-COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt
-COPY extra_python_requirements.txt /extra_python_requirements.txt
 COPY extra_debian_requirements.txt /extra_debian_requirements.txt
-
+RUN apt-get update -qq \
-# 3. <OOW> Install Debian packages
+    && apt-get install -y git \
-RUN apt-get update || true \
-    && apt-get install -y\
-    # <OOW> To allow to run pip install
-    python3-pip\
-    # <OOW> For python-ldap
-    libldap2-dev ldap-utils libsasl2-dev\
-    # <OOW> For cffi
-    build-essential libssl-dev libffi-dev python-dev\
     && xargs apt-get install -y --no-install-recommends <extra_debian_requirements.txt \
     && rm -rf /var/lib/apt/lists/*
 
-# 4. <OOW> Install Python librairies
+# <OOW> Install Python librairies
-RUN python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt
+COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt
-RUN python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt
+COPY extra_python_requirements.txt /extra_python_requirements.txt
+RUN pip3 install --upgrade pip \
+    && python3 -m pip install --no-cache-dir setuptools-scm \
+    && python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt \
+    && python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt
 
-# 5. <OOW> Get local user id and set it to the odoo user
+# <OOW> Get local user id and set it to the odoo user
 ARG LOCAL_USER_ID
 
 RUN useradd --uid $LOCAL_USER_ID odoo

odoo_openupgrade_wizard/templates/odoo/14.0/Dockerfile

@@ -1,75 +1,47 @@
-# <OOW> : Copy of https://github.com/odoo/odoo/blob/14.0/setup/package.dfdebian
+# <OOW> : Copy of https://github.com/odoo/odoo/blob/14.0/setup/package.dfsrc
-
 FROM debian:buster
 
-# 1. <OOW> Official Odoo Dockerfile.
+RUN apt-get update && \
-# Removing: postgresql, locales, rsync
+    apt-get install -y locales && \
+    rm -rf /var/lib/apt/lists/*
 
-ENV DEBIAN_FRONTEND noninteractive
+# Reconfigure locales such that postgresql uses UTF-8 encoding
+RUN dpkg-reconfigure locales && \
+    locale-gen C.UTF-8 && \
+    /usr/sbin/update-locale LANG=C.UTF-8
+ENV LC_ALL C.UTF-8
 
 RUN apt-get update -qq &&  \
     apt-get upgrade -qq -y && \
-    apt-get install -qq -y\
+    apt-get install \
-        adduser \
+        postgresql \
-        dh-python \
+        postgresql-server-dev-all \
-        packaging-dev \
         postgresql-client \
-        python3 \
+        adduser \
-        python3-babel \
+        libldap2-dev \
-        python3-dateutil \
+        libsasl2-dev \
-        python3-decorator \
+        python3-pip \
-        python3-docutils \
+        python3-wheel \
-        python3-gevent \
+        build-essential \
-        python3-pil \
+        python3 -y && \
-        python3-jinja2 \
+    rm -rf /var/lib/apt/lists/*
-        python3-libsass \
-        python3-lxml \
-        python3-mako \
-        python3-ofxparse \
-        python3-passlib \
-        python3-polib \
-        python3-psutil \
-        python3-psycopg2 \
-        python3-pydot \
-        python3-pypdf2 \
-        python3-qrcode \
-        python3-renderpm \
-        python3-reportlab \
-        python3-requests \
-        python3-serial \
-        python3-setuptools \
-        python3-stdnum \
-        python3-tz \
-        python3-usb \
-        python3-vobject \
-        python3-werkzeug \
-        python3-xlsxwriter \
-        python3-zeep \
-    && rm -rf /var/lib/apt/lists/*
 
-# 2. <OOW> Add 2 python dependency files and 1 debian dependency file
+# <OOW> Install Debian packages
-
-COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt
-COPY extra_python_requirements.txt /extra_python_requirements.txt
 COPY extra_debian_requirements.txt /extra_debian_requirements.txt
-
+RUN apt-get update -qq \
-# 3. <OOW> Install Debian packages
+    && apt-get install -y git \
-RUN apt-get update || true \
-    && apt-get install -y\
-    # <OOW> To allow to run pip install
-    python3-pip\
-    # <OOW> For python-ldap
-    libldap2-dev ldap-utils libsasl2-dev\
-    # <OOW> For cffi
-    build-essential libssl-dev libffi-dev python-dev\
     && xargs apt-get install -y --no-install-recommends <extra_debian_requirements.txt \
     && rm -rf /var/lib/apt/lists/*
 
-# 4. <OOW> Install Python librairies
+# <OOW> Install Python librairies
-RUN python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt
+COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt
-RUN python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt
+COPY extra_python_requirements.txt /extra_python_requirements.txt
+RUN pip3 install --upgrade pip \
+    && python3 -m pip install --no-cache-dir setuptools-scm \
+    && python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt \
+    && python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt
 
-# 5. <OOW> Get local user id and set it to the odoo user
+# <OOW> Get local user id and set it to the odoo user
 ARG LOCAL_USER_ID
 
 RUN useradd --uid $LOCAL_USER_ID odoo

odoo_openupgrade_wizard/templates/odoo/15.0/Dockerfile

@@ -1,73 +1,47 @@
-# <OOW> : Copy of https://github.com/odoo/odoo/blob/15.0/setup/package.dfdebian
+# <OOW> : Copy of https://github.com/odoo/odoo/blob/15.0/setup/package.dfsrc
+FROM debian:buster
 
-FROM debian:bullseye
+RUN apt-get update && \
+    apt-get install -y locales && \
+    rm -rf /var/lib/apt/lists/*
 
-# 1. <OOW> Official Odoo Dockerfile.
+# Reconfigure locales such that postgresql uses UTF-8 encoding
-# Removing: postgresql, locales, rsync
+RUN dpkg-reconfigure locales && \
-
+    locale-gen C.UTF-8 && \
-ENV DEBIAN_FRONTEND noninteractive
+    /usr/sbin/update-locale LANG=C.UTF-8
+ENV LC_ALL C.UTF-8
 
 RUN apt-get update -qq &&  \
     apt-get upgrade -qq -y && \
-    apt-get install -qq -y\
+    apt-get install \
-        adduser \
+        postgresql \
-        dh-python \
+        postgresql-server-dev-all \
-        packaging-dev \
         postgresql-client \
-        python3 \
+        adduser \
-        python3-babel \
+        libldap2-dev \
-        python3-dateutil \
+        libsasl2-dev \
-        python3-decorator \
+        python3-pip \
-        python3-docutils \
+        python3-wheel \
-        python3-gevent \
+        build-essential \
-        python3-pil \
+        python3 -y && \
-        python3-jinja2 \
+    rm -rf /var/lib/apt/lists/*
-        python3-libsass \
-        python3-lxml \
-        python3-ofxparse \
-        python3-passlib \
-        python3-polib \
-        python3-psutil \
-        python3-psycopg2 \
-        python3-pydot \
-        python3-openssl \
-        python3-pypdf2 \
-        python3-qrcode \
-        python3-renderpm \
-        python3-reportlab \
-        python3-requests \
-        python3-serial \
-        python3-setuptools \
-        python3-stdnum \
-        python3-tz \
-        python3-usb \
-        python3-vobject \
-        python3-werkzeug \
-        python3-xlsxwriter \
-        python3-zeep \
-    && rm -rf /var/lib/apt/lists/*
 
-# 2. <OOW> Add 2 python dependency files and 1 debian dependency file
+# <OOW> Install Debian packages
-
-COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt
-COPY extra_python_requirements.txt /extra_python_requirements.txt
 COPY extra_debian_requirements.txt /extra_debian_requirements.txt
-
+RUN apt-get update -qq \
-# 3. <OOW> Install Debian packages
+    && apt-get install -y git \
-RUN apt-get update || true \
-    && apt-get install -y\
-    # <OOW> To allow to run pip install
-    python3-pip\
-    # <OOW> For python-ldap
-    libldap2-dev ldap-utils libsasl2-dev\
     && xargs apt-get install -y --no-install-recommends <extra_debian_requirements.txt \
     && rm -rf /var/lib/apt/lists/*
 
-# 4. <OOW> Install Python librairies
+# <OOW> Install Python librairies
-RUN python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt
+COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt
-RUN python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt
+COPY extra_python_requirements.txt /extra_python_requirements.txt
+RUN pip3 install --upgrade pip \
+    && python3 -m pip install --no-cache-dir setuptools-scm \
+    && python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt \
+    && python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt
 
-# 5. <OOW> Get local user id and set it to the odoo user
+# <OOW> Get local user id and set it to the odoo user
 ARG LOCAL_USER_ID
 
 RUN useradd --uid $LOCAL_USER_ID odoo

odoo_openupgrade_wizard/templates/odoo/16.0/Dockerfile

@@ -1,73 +1,47 @@
-# <OOW> : Copy of https://github.com/odoo/odoo/blob/16.0/setup/package.dfdebian
+# <OOW> : Copy of https://github.com/odoo/odoo/blob/16.0/setup/package.dfsrc
+FROM debian:buster
 
-FROM debian:bullseye
+RUN apt-get update && \
+    apt-get install -y locales && \
+    rm -rf /var/lib/apt/lists/*
 
-# 1. <OOW> Official Odoo Dockerfile.
+# Reconfigure locales such that postgresql uses UTF-8 encoding
-# Removing: postgresql, locales, rsync
+RUN dpkg-reconfigure locales && \
-
+    locale-gen C.UTF-8 && \
-ENV DEBIAN_FRONTEND noninteractive
+    /usr/sbin/update-locale LANG=C.UTF-8
+ENV LC_ALL C.UTF-8
 
 RUN apt-get update -qq &&  \
     apt-get upgrade -qq -y && \
-    apt-get install -qq -y\
+    apt-get install \
-        adduser \
+        postgresql \
-        dh-python \
+        postgresql-server-dev-all \
-        packaging-dev \
         postgresql-client \
-        python3 \
+        adduser \
-        python3-babel \
+        libldap2-dev \
-        python3-dateutil \
+        libsasl2-dev \
-        python3-decorator \
+        python3-pip \
-        python3-docutils \
+        python3-wheel \
-        python3-gevent \
+        build-essential \
-        python3-pil \
+        python3 -y && \
-        python3-jinja2 \
+    rm -rf /var/lib/apt/lists/*
-        python3-libsass \
-        python3-lxml \
-        python3-ofxparse \
-        python3-passlib \
-        python3-polib \
-        python3-psutil \
-        python3-psycopg2 \
-        python3-pydot \
-        python3-openssl \
-        python3-pypdf2 \
-        python3-qrcode \
-        python3-renderpm \
-        python3-reportlab \
-        python3-requests \
-        python3-serial \
-        python3-setuptools \
-        python3-stdnum \
-        python3-tz \
-        python3-usb \
-        python3-vobject \
-        python3-werkzeug \
-        python3-xlsxwriter \
-        python3-zeep \
-    && rm -rf /var/lib/apt/lists/*
 
-# 2. <OOW> Add 2 python dependency files and 1 debian dependency file
+# <OOW> Install Debian packages
-
-COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt
-COPY extra_python_requirements.txt /extra_python_requirements.txt
 COPY extra_debian_requirements.txt /extra_debian_requirements.txt
-
+RUN apt-get update -qq \
-# 3. <OOW> Install Debian packages
+    && apt-get install -y git \
-RUN apt-get update || true \
-    && apt-get install -y\
-    # <OOW> To allow to run pip install
-    python3-pip\
-    # <OOW> For python-ldap
-    libldap2-dev ldap-utils libsasl2-dev\
     && xargs apt-get install -y --no-install-recommends <extra_debian_requirements.txt \
     && rm -rf /var/lib/apt/lists/*
 
-# 4. <OOW> Install Python librairies
+# <OOW> Install Python librairies
-RUN python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt
+COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt
-RUN python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt
+COPY extra_python_requirements.txt /extra_python_requirements.txt
+RUN pip3 install --upgrade pip \
+    && python3 -m pip install --no-cache-dir setuptools-scm \
+    && python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt \
+    && python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt
 
-# 5. <OOW> Get local user id and set it to the odoo user
+# <OOW> Get local user id and set it to the odoo user
 ARG LOCAL_USER_ID
 
 RUN useradd --uid $LOCAL_USER_ID odoo