feat: merge APT/DEB layers to reduce image size

Author: florentx

18.0/Dockerfile

@@ -23,7 +23,9 @@ COPY --chown=odoo:root --chmod=660 ./extra_requirements.txt /odoo
 # Moved because there was a bug while installing `odoo-autodiscover`. There is
 # an accent in the contributor name
 ENV LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8
+    LC_ALL=C.UTF-8 \
+    PATH=/odoo/.venv/bin:$PATH \
+    PYTHONPATH=/odoo/
 
 # build and dev packages
 ENV BUILD_PACKAGE="\
@@ -45,17 +47,22 @@ ENV BUILD_PACKAGE="\
 # Default SHELL is ["/bin/sh", "-c"]
 SHELL ["/bin/sh", "-e", "-x", "-c"]
 
+
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
 RUN /install/package_odoo.sh \
     && /install/setup-pip.sh \
     && /install/postgres.sh \
     && /install/kwkhtml_client.sh \
     && /install/kwkhtml_client_force_python3.sh \
-    && /install/dev_package.sh
-
-# grab dockerize to generate template and
-# wait on postgres
-RUN /install/dockerize.sh
+    && /install/dev_package.sh \
+    && su odoo -c "umask 007 \
+    && python3 -m venv /odoo/.venv --system-site-packages \
+    && /odoo/.venv/bin/pip install -r /odoo/base_requirements.txt \
+    && /odoo/.venv/bin/pip install -r /odoo/extra_requirements.txt" \
+    # Grab dockerize to generate template and wait on postgres \
+    && /install/dockerize.sh \
+    # Purge build packages, to reduce layer size \
+    && /install/purge_dev_package_and_cache.sh
 
 COPY --chown=odoo:root --chmod=660 ./src_requirements.txt /odoo
 COPY --chown=odoo:root --chmod=770 ./bin /odoo/odoo-bin
@@ -65,23 +72,9 @@ COPY --chown=odoo:root --chmod=770 ./start-entrypoint.d /odoo/start-entrypoint.d
 COPY --chown=odoo:root --chmod=660 ./MANIFEST.in /odoo
 
 
-VOLUME ["/data/odoo", "/var/log/odoo"]
 USER odoo
-RUN umask 007 \
-    && python3 -m venv /odoo/.venv --system-site-packages
-ENV PATH=/odoo/.venv/bin:$PATH
-ENV PYTHONPATH=/odoo/
 RUN echo "export PATH=$PATH" >> ~/.bashrc
 
-RUN umask 007 \
-    && /odoo/.venv/bin/pip install -r /odoo/base_requirements.txt \
-    && /odoo/.venv/bin/pip install -r /odoo/extra_requirements.txt
-USER root
-RUN /install/purge_dev_package_and_cache.sh
-
-USER odoo
-EXPOSE 8069 8072
-
 ENV ODOO_VERSION=18.0 \
     PATH=/odoo/odoo-bin:/odoo/.local/bin:$PATH \
     LANG=C.UTF-8 \
@@ -99,5 +92,8 @@ ENV ODOO_VERSION=18.0 \
     ADDONS_PATH=/odoo/odoo/addons,/odoo/odoo/src/odoo/addons \
     ODOO_RC=/odoo/odoo.cfg
 
+VOLUME ["/data/odoo", "/var/log/odoo"]
+EXPOSE 8069 8072
+
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["odoo"]

19.0/Dockerfile

@@ -23,7 +23,9 @@ COPY --chown=odoo:root --chmod=660 ./extra_requirements.txt /odoo
 # Moved because there was a bug while installing `odoo-autodiscover`. There is
 # an accent in the contributor name
 ENV LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8
+    LC_ALL=C.UTF-8 \
+    PATH=/odoo/.venv/bin:$PATH \
+    PYTHONPATH=/odoo/
 
 # build and dev packages
 ENV BUILD_PACKAGE="\
@@ -45,17 +47,22 @@ ENV BUILD_PACKAGE="\
 # Default SHELL is ["/bin/sh", "-c"]
 SHELL ["/bin/sh", "-e", "-x", "-c"]
 
+
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
 RUN /install/package_odoo.sh \
     && /install/setup-pip.sh \
     && /install/postgres.sh \
     && /install/kwkhtml_client.sh \
     && /install/kwkhtml_client_force_python3.sh \
-    && /install/dev_package.sh
-
-# grab dockerize to generate template and
-# wait on postgres
-RUN /install/dockerize.sh
+    && /install/dev_package.sh \
+    && su odoo -c "umask 007 \
+    && python3 -m venv /odoo/.venv --system-site-packages \
+    && /odoo/.venv/bin/pip install -r /odoo/base_requirements.txt \
+    && /odoo/.venv/bin/pip install -r /odoo/extra_requirements.txt" \
+    # Grab dockerize to generate template and wait on postgres \
+    && /install/dockerize.sh \
+    # Purge build packages, to reduce layer size \
+    && /install/purge_dev_package_and_cache.sh
 
 COPY --chown=odoo:root --chmod=660 ./src_requirements.txt /odoo
 COPY --chown=odoo:root --chmod=770 ./bin /odoo/odoo-bin
@@ -65,23 +72,9 @@ COPY --chown=odoo:root --chmod=770 ./start-entrypoint.d /odoo/start-entrypoint.d
 COPY --chown=odoo:root --chmod=660 ./MANIFEST.in /odoo
 
 
-VOLUME ["/data/odoo", "/var/log/odoo"]
 USER odoo
-RUN umask 007 \
-    && python3 -m venv /odoo/.venv --system-site-packages
-ENV PATH=/odoo/.venv/bin:$PATH
-ENV PYTHONPATH=/odoo/
 RUN echo "export PATH=$PATH" >> ~/.bashrc
 
-RUN umask 007 \
-    && /odoo/.venv/bin/pip install -r /odoo/base_requirements.txt \
-    && /odoo/.venv/bin/pip install -r /odoo/extra_requirements.txt
-USER root
-RUN /install/purge_dev_package_and_cache.sh
-
-USER odoo
-EXPOSE 8069 8072
-
 ENV ODOO_VERSION=19.0 \
     PATH=/odoo/odoo-bin:/odoo/.local/bin:$PATH \
     LANG=C.UTF-8 \
@@ -99,5 +92,8 @@ ENV ODOO_VERSION=19.0 \
     ADDONS_PATH=/odoo/odoo/addons,/odoo/odoo/src/odoo/addons \
     ODOO_RC=/odoo/odoo.cfg
 
+VOLUME ["/data/odoo", "/var/log/odoo"]
+EXPOSE 8069 8072
+
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["odoo"]