[UPD] docker: buster to bullseye, fix npm install
- add developer tools - update wkhtmltox to works with bullseye
This commit is contained in:
parent
6e29572a2b
commit
eff77820ba
2 changed files with 11 additions and 3 deletions
|
|
@ -1,4 +1,4 @@
|
|||
FROM python:3.7.16-slim-buster
|
||||
FROM python:3.7.17-slim-bullseye
|
||||
MAINTAINER TechnoLibre <docker@technolibre.ca>
|
||||
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 && \
|
||||
|
|
|
|||
Loading…
Reference in a new issue