diff --git a/Dockerfile b/Dockerfile index 0045b4bf9..b261e72f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,14 @@ COPY ./deployment/entrypoint.sh / # Copy entrypoint script and Odoo configuration file # COPY deployment/entrypoint.sh / # COPY deployment/odoo.conf /etc/odoo/ +USER root +RUN apt update -y && \ + apt install -y python3-pip libldap2-dev libpq-dev libsasl2-dev postgresql-client libreoffice wkhtmltopdf ansible terraform && \ + apt clean && rm -rf /var/lib/apt/lists/* +COPY ./requirements.txt /usr/lib/python3/dist-packages/ + +RUN pip install -r /usr/lib/python3/dist-packages/requirements.txt # Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons and /mnt/backup for backup RUN chown odoo /etc/odoo/odoo.conf \ && mkdir -p /mnt/extra-addons \ diff --git a/Makefile b/Makefile index 99a7a13ee..e288c89bb 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ CONFIG=odoo.conf HUB=hub.nextzenos.com CDN=https://cdn.nextzenos.com/CDN/NextERP ORGANIZATION=nexterp -PROJECT := odoo18 +PROJECT := Odoo18-Base ODOO_IMAGE=${HUB}/${ORGANIZATION}/$(PROJECT) TAG := $(shell git rev-parse --abbrev-ref HEAD) CONTAINER_ID=${PROJECT}-${TAG} diff --git a/extra-addons b/extra-addons index 08d94585b..39bbb49c5 160000 --- a/extra-addons +++ b/extra-addons @@ -1 +1 @@ -Subproject commit 08d94585b12f88eaa42ed3e607465017c5acd5bf +Subproject commit 39bbb49c53175744b850e2054fbbfb0ad9c47000