From fe5912dca193dd68b48c61bea0c686b2ab207bc3 Mon Sep 17 00:00:00 2001 From: wluyima Date: Tue, 18 Jun 2024 17:07:48 +0300 Subject: [PATCH 1/8] OZ-575 - Install python-jose that is required by oidc addons --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 451883d..ac9d295 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_${arch}.deb && \ dpkg -i wkhtmltox_0.12.6-1.buster_${arch}.deb && cp /usr/local/bin/wkhtmltopdf /usr/bin && cp /usr/local/bin/wkhtmltoimage /usr/bin RUN pip install phonenumbers +RUN pip install python-jose RUN npm install -g rtlcss RUN mkdir -p /opt/odoo From 444be9568e615babf7fd60d8f70cfcb88867634c Mon Sep 17 00:00:00 2001 From: wluyima Date: Wed, 19 Jun 2024 19:01:51 +0300 Subject: [PATCH 2/8] OZ-575 - Upgraded wkhtmltox --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac9d295..ad3b27a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,11 +6,11 @@ ARG ODOO_BRANCH=14.0 # Install dependencies RUN apt update && apt install -y git npm postgresql-client python3-dev libxml2-dev libxslt1-dev libldap2-dev libsasl2-dev \ - libtiff5-dev zlib1g-dev libfreetype6-dev wait-for-it xvfb libfontconfig wget \ + libtiff5-dev zlib1g-dev libfreetype6-dev wait-for-it xvfb libfontconfig fontconfig wget \ liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev libxcb1-dev libpq-dev gettext-base unzip xfonts-75dpi xfonts-base RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ - wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_${arch}.deb && \ - dpkg -i wkhtmltox_0.12.6-1.buster_${arch}.deb && cp /usr/local/bin/wkhtmltopdf /usr/bin && cp /usr/local/bin/wkhtmltoimage /usr/bin + wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && \ + dpkg -i wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && cp /usr/local/bin/wkhtmltopdf /usr/bin && cp /usr/local/bin/wkhtmltoimage /usr/bin RUN pip install phonenumbers RUN pip install python-jose RUN npm install -g rtlcss From cdd530d77c43ce2ba4b71541f7461f2a66a8aa40 Mon Sep 17 00:00:00 2001 From: wluyima Date: Wed, 19 Jun 2024 19:29:54 +0300 Subject: [PATCH 3/8] OZ-575 - Upgraded to pip3 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ad3b27a..3f139a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,14 +11,14 @@ RUN apt update && apt install -y git npm postgresql-client python3-dev libxml2-d RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && \ dpkg -i wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && cp /usr/local/bin/wkhtmltopdf /usr/bin && cp /usr/local/bin/wkhtmltoimage /usr/bin -RUN pip install phonenumbers -RUN pip install python-jose +RUN pip3 install phonenumbers +RUN pip3 install python-jose RUN npm install -g rtlcss RUN mkdir -p /opt/odoo RUN cd /tmp/ && wget https://github.com/mekomsolutions/odoo/archive/refs/heads/${ODOO_BRANCH}.zip \ && unzip /tmp/${ODOO_BRANCH}.zip && mv /tmp/odoo-${ODOO_BRANCH}/* /opt/odoo/ && rm /tmp/${ODOO_BRANCH}.zip -RUN cd /opt/odoo && pip install -r requirements.txt +RUN cd /opt/odoo && pip3 install -r requirements.txt # Expose Odoo services EXPOSE 8069 8071 8072 From 88c717fe8913f9917e20c90c5d8fcfa0035b9b47 Mon Sep 17 00:00:00 2001 From: wluyima Date: Wed, 19 Jun 2024 21:02:09 +0300 Subject: [PATCH 4/8] Revert "OZ-575 - Upgraded to pip3" This reverts commit cdd530d77c43ce2ba4b71541f7461f2a66a8aa40. --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f139a6..ad3b27a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,14 +11,14 @@ RUN apt update && apt install -y git npm postgresql-client python3-dev libxml2-d RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && \ dpkg -i wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && cp /usr/local/bin/wkhtmltopdf /usr/bin && cp /usr/local/bin/wkhtmltoimage /usr/bin -RUN pip3 install phonenumbers -RUN pip3 install python-jose +RUN pip install phonenumbers +RUN pip install python-jose RUN npm install -g rtlcss RUN mkdir -p /opt/odoo RUN cd /tmp/ && wget https://github.com/mekomsolutions/odoo/archive/refs/heads/${ODOO_BRANCH}.zip \ && unzip /tmp/${ODOO_BRANCH}.zip && mv /tmp/odoo-${ODOO_BRANCH}/* /opt/odoo/ && rm /tmp/${ODOO_BRANCH}.zip -RUN cd /opt/odoo && pip3 install -r requirements.txt +RUN cd /opt/odoo && pip install -r requirements.txt # Expose Odoo services EXPOSE 8069 8071 8072 From a96dc63693ae42bb88f14ffc94da33c892c47e7a Mon Sep 17 00:00:00 2001 From: wluyima Date: Wed, 19 Jun 2024 21:02:51 +0300 Subject: [PATCH 5/8] OZ-575 - Added line to upgrade pip --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index ad3b27a..9ed0668 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ RUN apt update && apt install -y git npm postgresql-client python3-dev libxml2-d RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && \ dpkg -i wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && cp /usr/local/bin/wkhtmltopdf /usr/bin && cp /usr/local/bin/wkhtmltoimage /usr/bin +RUN pip install --upgrade pip RUN pip install phonenumbers RUN pip install python-jose RUN npm install -g rtlcss From f91a3e5a55bfdbda2d89e66df8497549f3c2db78 Mon Sep 17 00:00:00 2001 From: wluyima Date: Thu, 20 Jun 2024 10:12:43 +0300 Subject: [PATCH 6/8] OZ-575 - Upgraded to pip3 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9ed0668..ae2c421 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,15 +11,15 @@ RUN apt update && apt install -y git npm postgresql-client python3-dev libxml2-d RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && \ dpkg -i wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && cp /usr/local/bin/wkhtmltopdf /usr/bin && cp /usr/local/bin/wkhtmltoimage /usr/bin -RUN pip install --upgrade pip -RUN pip install phonenumbers -RUN pip install python-jose +RUN pip3 install --upgrade pip3 +RUN pip3 install phonenumbers +RUN pip3 install python-jose RUN npm install -g rtlcss RUN mkdir -p /opt/odoo RUN cd /tmp/ && wget https://github.com/mekomsolutions/odoo/archive/refs/heads/${ODOO_BRANCH}.zip \ && unzip /tmp/${ODOO_BRANCH}.zip && mv /tmp/odoo-${ODOO_BRANCH}/* /opt/odoo/ && rm /tmp/${ODOO_BRANCH}.zip -RUN cd /opt/odoo && pip install -r requirements.txt +RUN cd /opt/odoo && pip3 install -r requirements.txt # Expose Odoo services EXPOSE 8069 8071 8072 From 393407c38779d3a30fb1d683dd29b3cd5d59da89 Mon Sep 17 00:00:00 2001 From: wluyima Date: Thu, 20 Jun 2024 10:47:28 +0300 Subject: [PATCH 7/8] OZ-575 - Fixed pip upgrade command --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ae2c421..5886615 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN apt update && apt install -y git npm postgresql-client python3-dev libxml2-d RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && \ dpkg -i wkhtmltox_0.12.6.1-3.bookworm_${arch}.deb && cp /usr/local/bin/wkhtmltopdf /usr/bin && cp /usr/local/bin/wkhtmltoimage /usr/bin -RUN pip3 install --upgrade pip3 +RUN pip3 install --upgrade pip RUN pip3 install phonenumbers RUN pip3 install python-jose RUN npm install -g rtlcss From 16233a49ba16bfd84549815ef8b0a7b495c47caa Mon Sep 17 00:00:00 2001 From: Emmanuel Nyachoke Date: Tue, 9 Jul 2024 07:35:48 +0300 Subject: [PATCH 8/8] Fix ARM build --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5886615..7e34cd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,8 @@ RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ RUN pip3 install --upgrade pip RUN pip3 install phonenumbers RUN pip3 install python-jose +RUN pip install pip setuptools wheel Cython==3.0.0a10 +RUN pip install gevent==20.9.0 --no-build-isolation RUN npm install -g rtlcss RUN mkdir -p /opt/odoo