[enh] add pull of source image when rebuilding Odoo docker

handlers/main.yml

@@ -5,6 +5,20 @@
     files: whitelists.yaml
     project_name: whitelists
 
+- name: pull odoo docker ML image
+  docker_image:
+    name: lefilament/odoo:{{ odoo_version }}_ml
+    source: pull
+    force_source: yes
+  when: odoo_multilingual is defined and odoo_multilingual
+
+- name: pull odoo docker image
+  docker_image:
+    name: lefilament/odoo:{{ odoo_version }}
+    source: pull
+    force_source: yes
+  when: odoo_multilingual is not defined or not odoo_multilingual
+
 - name: build odoo_test docker
   docker_compose:
     project_src: /home/docker/odootest/
@@ -73,3 +87,10 @@
     project_src: /home/docker/odoo/
     remove_orphans: yes
 
+- name: remove intermediate image
+  docker_prune:
+    builder_cache: yes
+    images: yes
+    images_filters:
+      label: stage=builder
+  when: inventory_hostname not in groups['maintenance_contract']

tasks/main.yml

@@ -37,7 +37,10 @@
   with_items: '{{ odoo_nonprod_instances | default([]) }}'
   loop_control:
     label: '{{ item.name }}'
-  notify: build {{ item.name }} docker
+  notify:
+    - pull odoo docker ML image
+    - pull odoo docker image
+    - build {{ item.name }} docker
   tags: odoo_nonprod
 
 - name: NONPROD copy update scripts to be run during build
@@ -50,7 +53,10 @@
   with_items: '{{ odoo_nonprod_instances | default([]) }}'
   loop_control:
     label: '{{ item.name }}'
-  notify: build {{ item.name }} docker
+  notify:
+    - pull odoo docker ML image
+    - pull odoo docker image
+    - build {{ item.name }} docker
   tags: odoo_nonprod
 
 - name: NONPROD set repos.yaml variables from template
@@ -63,7 +69,10 @@
   with_items: '{{ odoo_nonprod_instances | default([]) }}'
   loop_control:
     label: '{{ item.name }}'
-  notify: build {{ item.name }} docker
+  notify:
+    - pull odoo docker ML image
+    - pull odoo docker image
+    - build {{ item.name }} docker
   tags: odoo_nonprod
 
 - name: NONPROD set repos-addons.yaml variables from template
@@ -76,7 +85,10 @@
   with_items: '{{ odoo_nonprod_instances | default([]) }}'
   loop_control:
     label: '{{ item.name }}'
-  notify: build {{ item.name }} docker
+  notify:
+    - pull odoo docker ML image
+    - pull odoo docker image
+    - build {{ item.name }} docker
   tags: odoo_nonprod
 
 - name: NONPROD copy odoo.conf file
@@ -116,7 +128,10 @@
   with_items: '{{ odoo_nonprod_instances | default([]) }}'
   loop_control:
     label: '{{ item.name }}'
-  notify: build {{ item.name }} docker
+  notify:
+    - pull odoo docker ML image
+    - pull odoo docker image
+    - build {{ item.name }} docker
   tags: odoo_nonprod
 
 - name: NONPROD copy test docker compose service
@@ -162,7 +177,10 @@
     group: root
     mode: '0644'
   when: odoo_nonprod_instances is not defined and odoo_prod is defined
-  notify: build odoo docker prod
+  notify:
+    - pull odoo docker ML image
+    - pull odoo docker image
+    - build odoo docker prod
   tags: odoo_prod
 
 - name: PROD copy update scripts to be run during build
@@ -176,7 +194,10 @@
     - fetch_repos
     - fetch_repos_addons
   when: odoo_nonprod_instances is not defined and odoo_prod is defined
-  notify: build odoo docker prod
+  notify:
+    - pull odoo docker ML image
+    - pull odoo docker image
+    - build odoo docker prod
   tags: odoo_prod
 
 - name: PROD set repos variables from template
@@ -189,7 +210,10 @@
   vars:
     item: "{{ odoo_prod }}"
   when: odoo_nonprod_instances is not defined and odoo_prod is defined
-  notify: build odoo docker prod
+  notify:
+    - pull odoo docker ML image
+    - pull odoo docker image
+    - build odoo docker prod
   tags: odoo_prod
 
 - name: PROD set repos-addons variables from template
@@ -202,7 +226,10 @@
   vars:
     item: "{{ odoo_prod }}"
   when: odoo_nonprod_instances is not defined and odoo_prod is defined
-  notify: build odoo docker prod
+  notify:
+    - pull odoo docker ML image
+    - pull odoo docker image
+    - build odoo docker prod
   tags: odoo_prod
 
 - name: PROD copy odoo.conf file
@@ -213,7 +240,10 @@
     group: root
     mode: '0600'
   when: odoo_nonprod_instances is not defined and odoo_prod is defined
-  notify: build odoo docker prod
+  notify:
+    - pull odoo docker ML image
+    - pull odoo docker image
+    - build odoo docker prod
   tags: odoo_prod
 
 - name: PROD copy private ssh keys file
@@ -271,7 +301,7 @@
 
 - name: Install necessary python modules
   pip:
-    name: ['prettytable', 'cssselect', 'html2text', 'unidecode', 'python-dateutil', 'lxml', 'Pillow', 'Babel', 'pyyaml', 'requests']
+    name: ['prettytable', 'cssselect', 'html2text', 'unidecode', 'python-dateutil', 'lxml', 'Pillow', 'Babel', 'pyyaml', 'requests', 'pyOpenSSL']
     executable: /usr/bin/pip3
     state: latest
   when: banking is defined and odoo_prod is defined