Add extra URL and multi-stage build for Odoo

README.md

@@ -102,6 +102,8 @@ odoo_prod:
        branch: 12.0-mig-account_bank_statement_import_ofx
        modules:
          - account_bank_statement_import_ofx
+    extra_urls:
+      - "sso.le-filament.com"
 
 odoo_nonprod_instances:
       - name: odoo_test
@@ -123,6 +125,8 @@ odoo_nonprod_instances:
         custom_modules_oca: "{{ odoo_prod.custom_modules_oca | default([]) }}"
         other_repos: "{{ odoo_prod.other_repos | default([]) }}"
         other_modules: "{{ odoo_prod.other_modules | default([]) }}"
+        extra_urls:
+          - "sso.le-filament.com"
 
 # OPTIONAL - Odoo multilingual - Will install Odoo with all languages (English and French only if set to no)
 odoo_multilingual: no

templates/Dockerfile.j2

-FROM lefilament/odoo:{{ odoo_version }}{% if odoo_multilingual is defined and odoo_multilingual %}_ml{% endif %}
-
-MAINTAINER Le Filament <https://le-filament.com>
-
+## Image to get git repos
+FROM lefilament/odoo:{{ odoo_version }}{% if odoo_multilingual is defined and odoo_multilingual %}_ml{% endif %} as odoo_addons
+LABEL stage=builder
 USER root
-{% if odoo_pip_packages is defined %}
-# Install pip packages
-RUN pip install {{ odoo_pip_packages }}
-{% endif %}
 {% if git_private_keys is defined %}
 # Install private keys
 COPY ./id_rsa ~root/.ssh/
 {% endif %}
 # Install private repos
 COPY ./private/* /opt/odoo/private/
+RUN chown -R root:root /opt/odoo/additional_addons /opt/odoo/private_addons
 RUN /opt/odoo/private/fetch_repos_addons
 RUN /opt/odoo/private/fetch_repos
 
+## Final image
+FROM lefilament/odoo:{{ odoo_version }}{% if odoo_multilingual is defined and odoo_multilingual %}_ml{% endif %} as final
+USER root
+COPY --from=odoo_addons --chown=odoo:odoo /opt/odoo/private_addons /opt/odoo/private_addons
+COPY --from=odoo_addons --chown=odoo:odoo /opt/odoo/additional_addons /opt/odoo/additional_addons
+{% if odoo_pip_packages is defined %}
+# Install pip packages
+RUN pip install {{ odoo_pip_packages }}
+{% endif %}
 # Copy Odoo configuration file
-COPY ./odoo.conf /opt/odoo/etc/odoo.conf
-RUN chown odoo:odoo /opt/odoo/etc/odoo.conf
-
+COPY --chown=odoo:odoo ./odoo.conf /opt/odoo/etc/odoo.conf
 USER odoo

templates/backup.yaml.j2

@@ -18,9 +18,7 @@ services:
             SWIFT_REGIONNAME: "{{ swift_odoo_regionname }}"
             JOB_200_WHAT: "pg_dump --no-owner --format c --file $$SRC/$$PGDATABASE.pgdump"
             JOB_300_WHAT: "backup --full-if-older-than 6D --allow-source-mismatch"
-            JOB_301_WHAT: "dup remove-all-inc-of-but-n-full 1 --force $$DST $$@"
-            JOB_301_WHEN: "daily"
-            JOB_302_WHAT: "dup remove-all-but-n-full 4 --force $$DST $$@"
+            JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@"
             JOB_302_WHEN: "daily"
         volumes:
             - odoo_filestore:/mnt/backup/src/odoo:z

templates/fetch_repos

@@ -23,9 +23,6 @@ if os.path.isfile(REPO_FILE):
             call(["git", "clone", "-b", repos[repo]["branch"], "--depth", "1", repos[repo]["url"],
                   DEFAULT_PRIVATE_REPO+"/"+repo])
 
-        for root, dirs, files in os.walk(DEFAULT_PRIVATE_REPO):
-            for target in dirs + files:
-                os.chown(os.path.join(root, target), UID, GID)
 {% if odoo_version == 10.0 %}
         if os.path.isdir("/opt/odoo/private_addons/lf_theme"):
             if not os.path.isfile("/opt/odoo/private_addons/lf_theme/static\

templates/fetch_repos_addons

@@ -32,7 +32,4 @@ if os.path.isfile(REPO_ADDON_FILE):
                 shutil.move("/tmp/addon"+repo+"/"+module,
                             DEFAULT_PRIVATE_REPO+"/"+module)
 
-        for root, dirs, files in os.walk(DEFAULT_PRIVATE_REPO):
-            for target in dirs + files:
-                os.chown(os.path.join(root, target), UID, GID)
         shutil.rmtree("/tmp/addon")

templates/prod.yaml.j2

@@ -111,23 +111,25 @@ services:
         container_name: odoo_smtp
         restart: unless-stopped
 {% endif %}
-{% if sso_url is defined %}
+{% if odoo_prod.extra_urls is defined %}
+{% for url in odoo_prod.extra_urls %}
 
-    sso:
+    {{ url }}:
         image: tecnativa/whitelist
-        container_name: odoo_sso
+        container_name: odoo_{{ url }}
         labels:
             co.elastic.logs/enabled: "false"
         networks:
             whitelists_proxy:
                 aliases:
-                    - "{{ sso_url }}"
+                    - "{{ url }}"
             whitelists_public:
         environment:
             PORT: "443"
-            TARGET: "{{ sso_url }}"
+            TARGET: "{{ url }}"
             PRE_RESOLVE: 1
         restart: unless-stopped
+{% endfor %}
 {% endif %}
 
 networks:
@@ -139,10 +141,11 @@ networks:
         external: true
     whitelists_proxy:
         external: true
-{% if sso_url is defined %}
+{% if odoo_prod.extra_urls is defined %}
     whitelists_public:
         external: true
 {% endif %}
+{% endif %}
 {% if mailname is defined %}
     email_proxy:
         driver_opts:

templates/test.yaml.j2

@@ -73,23 +73,25 @@ services:
             traefik.http.routers.{{ item.dir }}smtp.rule: "Host(`{{ item.url }}`) && PathPrefix(`/smtp/`)"
             traefik.http.routers.{{ item.dir }}smtp.service: "{{ item.dir }}smtp"
             traefik.http.services.{{ item.dir }}smtp.loadbalancer.server.port: "8025"
-{% if sso_url is defined %}
+{% if item.extra_urls is defined %}
+{% for url in item.extra_urls %}
 
-    sso:
+    {{ url }}:
         image: tecnativa/whitelist
-        container_name: {{ item.dir }}_sso
+        container_name: {{ item.dir }}_{{ url }}
         labels:
             co.elastic.logs/enabled: "false"
         networks:
             whitelists_proxy:
                 aliases:
-                    - "{{ sso_url }}"
+                    - "{{ url }}"
             whitelists_public:
         environment:
             PORT: "443"
-            TARGET: "{{ sso_url }}"
+            TARGET: "{{ url }}"
             PRE_RESOLVE: 1
         restart: unless-stopped
+{% endfor %}
 {% endif %}
 
 networks:

templates/whitelists.yaml.j2

@@ -136,6 +136,7 @@ services:
                     - "sources.le-filament.com"
             public:
         environment:
+            PORT: "443 22"
             TARGET: "sources.le-filament.com"
             PRE_RESOLVE: 1
         labels: