From 0c835c74852ce8f722a3fd06d03bcfd927719889 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Wed, 22 Jan 2020 15:57:16 +0100
Subject: [PATCH] [IMP] Odoo 11.0-13.0: remove a RUN layer

Small improvement to minimze the number of layers.
Thanks to @valerianpereira for the PR.

Closes #188
---
 11.0/Dockerfile | 6 +++---
 12.0/Dockerfile | 6 +++---
 13.0/Dockerfile | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index a69daed..44d389c 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -63,11 +63,11 @@ RUN set -x; \
 # Copy entrypoint script and Odoo configuration file
 COPY ./entrypoint.sh /
 COPY ./odoo.conf /etc/odoo/
-RUN chown odoo /etc/odoo/odoo.conf
 
 # Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
-RUN mkdir -p /mnt/extra-addons \
-        && chown -R odoo /mnt/extra-addons
+RUN chown odoo /etc/odoo/odoo.conf \
+    && mkdir -p /mnt/extra-addons \
+    && chown -R odoo /mnt/extra-addons
 VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 
 # Expose Odoo services
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 7dd07c4..acf092a 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -77,11 +77,11 @@ RUN set -x; \
 # Copy entrypoint script and Odoo configuration file
 COPY ./entrypoint.sh /
 COPY ./odoo.conf /etc/odoo/
-RUN chown odoo /etc/odoo/odoo.conf
 
 # Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
-RUN mkdir -p /mnt/extra-addons \
-        && chown -R odoo /mnt/extra-addons
+RUN chown odoo /etc/odoo/odoo.conf \
+    && mkdir -p /mnt/extra-addons \
+    && chown -R odoo /mnt/extra-addons
 VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 
 # Expose Odoo services
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
index c25f011..ec42aa6 100644
--- a/13.0/Dockerfile
+++ b/13.0/Dockerfile
@@ -65,11 +65,11 @@ RUN set -x; \
 # Copy entrypoint script and Odoo configuration file
 COPY ./entrypoint.sh /
 COPY ./odoo.conf /etc/odoo/
-RUN chown odoo /etc/odoo/odoo.conf
 
-# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
-RUN mkdir -p /mnt/extra-addons \
-        && chown -R odoo /mnt/extra-addons
+# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
+RUN chown odoo /etc/odoo/odoo.conf \
+    && mkdir -p /mnt/extra-addons \
+    && chown -R odoo /mnt/extra-addons
 VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 
 # Expose Odoo services