Silence some Dockerfile build warnings

Author: florentx

14.0/Dockerfile

@@ -15,7 +15,7 @@ ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8
 
 # build and dev packages
-ENV BUILD_PACKAGE \
+ENV BUILD_PACKAGE="\
     build-essential \
     gcc \
     libevent-dev \
@@ -28,8 +28,7 @@ ENV BUILD_PACKAGE \
     libjpeg-dev \
     libpng-dev \
     zlib1g-dev \
-    libcairo2-dev
-
+    libcairo2-dev"
 
 
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
@@ -65,7 +64,7 @@ VOLUME ["/data/odoo", "/var/log/odoo"]
 USER odoo
 RUN python3 -m venv /odoo/.venv  --system-site-packages
 ENV PATH=/odoo/.venv/bin:$PATH
-ENV PYTHONPATH=$PYTHONPATH:/odoo/
+ENV PYTHONPATH=/odoo/
 RUN echo "export PATH=$PATH" >> ~/.bashrc
 
 RUN /odoo/.venv/bin/pip install -r /odoo/base_requirements.txt

15.0/Dockerfile

@@ -15,7 +15,7 @@ ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8
 
 # build and dev packages
-ENV BUILD_PACKAGE \
+ENV BUILD_PACKAGE="\
     build-essential \
     gcc \
     libevent-dev \
@@ -28,8 +28,7 @@ ENV BUILD_PACKAGE \
     libjpeg-dev \
     libpng-dev \
     zlib1g-dev \
-    libcairo2-dev
-
+    libcairo2-dev"
 
 
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
@@ -65,7 +64,7 @@ VOLUME ["/data/odoo", "/var/log/odoo"]
 USER odoo
 RUN python3 -m venv /odoo/.venv  --system-site-packages
 ENV PATH=/odoo/.venv/bin:$PATH
-ENV PYTHONPATH=$PYTHONPATH:/odoo/
+ENV PYTHONPATH=/odoo/
 RUN echo "export PATH=$PATH" >> ~/.bashrc
 
 RUN /odoo/.venv/bin/pip install -r /odoo/base_requirements.txt

16.0/Dockerfile

@@ -14,7 +14,7 @@ ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8
 
 # build and dev packages
-ENV BUILD_PACKAGE \
+ENV BUILD_PACKAGE="\
     build-essential \
     gcc \
     libevent-dev \
@@ -27,7 +27,8 @@ ENV BUILD_PACKAGE \
     libjpeg-dev \
     libpng-dev \
     zlib1g-dev \
-    libcairo2-dev
+    libcairo2-dev"
+
 
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
 # wkhtml-buster is kept as in official image, no deb available for bullseye
@@ -62,7 +63,7 @@ VOLUME ["/data/odoo", "/var/log/odoo"]
 USER odoo
 RUN python3 -m venv /odoo/.venv  --system-site-packages
 ENV PATH=/odoo/.venv/bin:$PATH
-ENV PYTHONPATH=$PYTHONPATH:/odoo/
+ENV PYTHONPATH=/odoo/
 RUN echo "export PATH=$PATH" >> ~/.bashrc
 
 RUN /odoo/.venv/bin/pip install -r /odoo/base_requirements.txt

17.0/Dockerfile

@@ -15,7 +15,7 @@ ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8
 
 # build and dev packages
-ENV BUILD_PACKAGE \
+ENV BUILD_PACKAGE="\
     build-essential \
     gcc \
     libevent-dev \
@@ -28,7 +28,8 @@ ENV BUILD_PACKAGE \
     libjpeg-dev \
     libpng-dev \
     zlib1g-dev \
-    libcairo2-dev
+    libcairo2-dev"
+
 
 # run in a virtualenv
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
@@ -64,7 +65,7 @@ VOLUME ["/data/odoo", "/var/log/odoo"]
 USER odoo
 RUN python3 -m venv /odoo/.venv  --system-site-packages
 ENV PATH=/odoo/.venv/bin:$PATH
-ENV PYTHONPATH=$PYTHONPATH:/odoo/
+ENV PYTHONPATH=/odoo/
 RUN echo "export PATH=$PATH" >> ~/.bashrc
 
 RUN /odoo/.venv/bin/pip install -r /odoo/base_requirements.txt

18.0/Dockerfile

@@ -14,7 +14,7 @@ ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8
 
 # build and dev packages
-ENV BUILD_PACKAGE \
+ENV BUILD_PACKAGE="\
     build-essential \
     gcc \
     libevent-dev \
@@ -27,7 +27,7 @@ ENV BUILD_PACKAGE \
     libjpeg-dev \
     libpng-dev \
     zlib1g-dev \
-    libcairo2-dev
+    libcairo2-dev"
 
 
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
@@ -43,6 +43,7 @@ RUN set -x; \
 # grab dockerize to generate template and
 # wait on postgres
 RUN /install/dockerize.sh
+
 COPY ./src_requirements.txt /odoo
 COPY ./bin /odoo/odoo-bin
 COPY ./templates /templates
@@ -62,7 +63,7 @@ VOLUME ["/data/odoo", "/var/log/odoo"]
 USER odoo
 RUN python3 -m venv /odoo/.venv  --system-site-packages
 ENV PATH=/odoo/.venv/bin:$PATH
-ENV PYTHONPATH=$PYTHONPATH:/odoo/
+ENV PYTHONPATH=/odoo/
 RUN echo "export PATH=$PATH" >> ~/.bashrc
 
 RUN /odoo/.venv/bin/pip install -r /odoo/base_requirements.txt