Pierre Ozoux authored Oct 07, 2020 and Michel Memeteau committed Oct 07, 2020

This change also rebases onto using the official base image,
and no longer the PR that is abandonned.