From eff77820ba0fe18e8273e54af3aae1880d6b9d97 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 2 Dec 2023 14:07:14 -0500 Subject: [PATCH] [UPD] docker: buster to bullseye, fix npm install - add developer tools - update wkhtmltox to works with bullseye --- docker/Dockerfile.base | 10 +++++++--- docker/Dockerfile.prod.pkg | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index c431d76..dac9d71 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -1,4 +1,4 @@ -FROM python:3.7.16-slim-buster +FROM python:3.7.17-slim-bullseye MAINTAINER TechnoLibre SHELL ["/bin/bash", "-xo", "pipefail", "-c"] @@ -27,6 +27,10 @@ RUN apt-get update \ npm \ xz-utils \ git \ + tree \ + vim \ + htop \ + tig \ wget \ make \ libssl-dev \ @@ -56,8 +60,8 @@ RUN apt-get update \ libncursesw5-dev \ libffi-dev \ uuid-dev \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ - && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb \ + && echo 'd9f259a67e05e1c221d48b504453645e6c491fab wkhtmltox.deb' | sha1sum -c - \ && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb diff --git a/docker/Dockerfile.prod.pkg b/docker/Dockerfile.prod.pkg index 8c2c33c..aaafac7 100644 --- a/docker/Dockerfile.prod.pkg +++ b/docker/Dockerfile.prod.pkg @@ -43,6 +43,10 @@ RUN cd $ODOO_PREFIX && \ ./.venv/bin/poetry --version && \ ./.venv/bin/poetry install +# Install local npm +RUN cd $ODOO_PREFIX && \ + npm install + RUN cd $ODOO_PREFIX && \ head /etc/odoo/odoo.conf && \ ./docker/repo_manifest_gen_org_prefix_path.py $ODOO_PREFIX/addons /etc/odoo/odoo.conf /etc/odoo/odoo.conf && \