diff --git a/10.0.Dockerfile b/10.0.Dockerfile
index 139749ac0f019d83ff312d3f320717a9a488d49c..db9c1ff3728009c7295c8469da462a68e30264b5 100644
--- a/10.0.Dockerfile
+++ b/10.0.Dockerfile
@@ -1,12 +1,14 @@
FROM debian/eol:jessie
MAINTAINER Le Filament <https://le-filament.com>
+ARG SAVE_COMMITS_DIR='/opt/odoo_commits/'
ENV APT_DEPS='python-dev build-essential libxml2-dev libxslt1-dev libjpeg-dev libfreetype6-dev \
liblcms2-dev libopenjpeg-dev libtiff5-dev tk-dev tcl-dev linux-headers-amd64 \
libpq-dev libldap2-dev libsasl2-dev' \
LANG=C.UTF-8 \
LC_ALL=C.UTF-8 \
- PGDATABASE=odoo
+ PGDATABASE=odoo \
+ SAVE_COMMITS_DIR=$SAVE_COMMITS_DIR
RUN set -x; \
sed -Ei 's@(^deb http://deb.debian.org/debian jessie-updates main$)@#\1@' /etc/apt/sources.list &&\
@@ -58,53 +60,62 @@ RUN set -x; \
COPY ./ssh_known_git_hosts /root/.ssh/known_hosts
# Install Odoo and remove not French translations and .git directory to limit amount of data used by container
+ARG SAVE_COMMITS_FILENAME='ocb'
RUN set -x; \
- useradd --create-home --home-dir /opt/odoo --no-log-init odoo &&\
- /bin/bash -c "mkdir -p /opt/odoo/{etc,odoo,additional_addons,private_addons,data,private}" &&\
- git clone -b 10.0 --depth 1 https://github.com/OCA/OCB.git /opt/odoo/odoo &&\
- rm -rf /opt/odoo/odoo/.git &&\
- find /opt/odoo/odoo/addons/*/i18n/ /opt/odoo/odoo/odoo/addons/base/i18n/ -type f -not -name 'fr.po' -delete &&\
- chown -R odoo:odoo /opt/odoo
+ repo='https://github.com/OCA/OCB' \
+ && useradd --create-home --home-dir /opt/odoo --no-log-init odoo \
+ && /bin/bash -c "mkdir -p /opt/odoo/{etc,odoo,additional_addons,private_addons,data,private}" \
+ && mkdir /opt/odoo_commits \
+ && git clone --single-branch --branch '16.0' --depth 1 "${repo}" /tmp/repo \
+ && commit="$(git -C /tmp/repo rev-parse HEAD)" \
+ && mv /tmp/repo/* /opt/odoo/odoo/ \
+ && echo "${repo};${commit}" > $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME \
+ && rm -r /tmp/repo \
+ # Only keep French translations.
+ && find /opt/odoo/odoo/addons/*/i18n/ /opt/odoo/odoo/odoo/addons/base/i18n/ -type f -not -name 'fr.po' -delete \
+ && echo "info: OCB commit:" \
+ && cat $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME
+
+# Add script to download Odoo addons.
+COPY --chown=root:root --chmod=755 ./get_addons /usr/local/bin
# Install Odoo OCA default dependencies
+ARG SAVE_COMMITS_FILENAME='default_addons'
RUN set -x; \
- mkdir -p /tmp/oca-repos/ &&\
- git clone -b 10.0 --depth 1 https://github.com/OCA/account-financial-reporting.git /tmp/oca-repos/account-financial-reporting &&\
- mv /tmp/oca-repos/account-financial-reporting/account_tax_balance /opt/odoo/additional_addons/ &&\
- git clone -b 10.0 --depth 1 https://github.com/OCA/bank-statement-import.git /tmp/oca-repos/bank-statement-import &&\
- mv /tmp/oca-repos/bank-statement-import/account_bank_statement_import_ofx \
- /tmp/oca-repos/bank-statement-import/account_bank_statement_import_qif \
- /opt/odoo/additional_addons/ &&\
- git clone -b 10.0 --depth 1 https://github.com/OCA/knowledge.git /tmp/oca-repos/knowledge &&\
- mv /tmp/oca-repos/knowledge/knowledge /tmp/oca-repos/knowledge/document_page /opt/odoo/additional_addons/ &&\
- git clone -b 10.0 --depth 1 https://github.com/OCA/partner-contact.git /tmp/oca-repos/partner-contact &&\
- mv /tmp/oca-repos/partner-contact/partner_firstname \
- /tmp/oca-repos/partner-contact/partner_disable_gravatar \
- /opt/odoo/additional_addons/ &&\
- git clone -b 10.0 --depth 1 https://github.com/OCA/server-tools.git /tmp/oca-repos/server-tools &&\
- mv /tmp/oca-repos/server-tools/date_range \
- /tmp/oca-repos/server-tools/auth_session_timeout \
- /tmp/oca-repos/server-tools/auth_brute_force \
- /tmp/oca-repos/server-tools/password_security \
- /opt/odoo/additional_addons/ &&\
- git clone -b 10.0 --depth 1 https://github.com/OCA/social.git /tmp/oca-repos/social &&\
- mv /tmp/oca-repos/social/mail_debrand \
- /tmp/oca-repos/social/mail_restrict_follower_selection \
- /opt/odoo/additional_addons/ &&\
- git clone -b 10.0 --depth 1 https://github.com/OCA/web.git /tmp/oca-repos/web &&\
- mv /tmp/oca-repos/web/web_environment_ribbon \
- /tmp/oca-repos/web/web_export_view \
- /tmp/oca-repos/web/web_responsive \
- /tmp/oca-repos/web/web_timeline \
- /opt/odoo/additional_addons/ &&\
- rm -rf /tmp/oca-repos/ &&\
- find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete &&\
- chown -R odoo:odoo /opt/odoo
+ get_addons 'https://github.com/OCA/account-financial-reporting' '10.0' 'additional_addons' \
+ account_tax_balance \
+ && get_addons 'https://github.com/OCA/bank-statement-import' '10.0' 'additional_addons' \
+ account_bank_statement_import_ofx \
+ account_bank_statement_import_qif \
+ && get_addons 'https://github.com/OCA/knowledge' '10.0' 'additional_addons' \
+ knowledge \
+ document_page \
+ && get_addons 'https://github.com/OCA/partner-contact' '10.0' 'additional_addons' \
+ partner_firstname \
+ partner_disable_gravatar \
+ && get_addons 'https://github.com/OCA/server-tools' '10.0' 'additional_addons' \
+ date_range \
+ auth_session_timeout \
+ auth_brute_force \
+ password_security \
+ && get_addons 'https://github.com/OCA/social' '10.0' 'additional_addons' \
+ mail_debrand \
+ mail_restrict_follower_selection \
+ && get_addons 'https://github.com/OCA/web' '10.0' 'additional_addons' \
+ web_environment_ribbon \
+ web_export_view \
+ web_responsive \
+ web_timeline \
+ # Only keep French translations.
+ && find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete \
+ # Print modules and commits.
+ && echo "info: default addon commits:" \
+ && cat $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME
# Copy entrypoint script and Odoo configuration file
COPY ./entrypoint.sh /
COPY ./odoo.conf /opt/odoo/etc/odoo.conf
-RUN chown odoo:odoo /opt/odoo/etc/odoo.conf
+RUN chown -R odoo:odoo /opt/odoo
# Mount /opt/odoo/data to allow restoring filestore
VOLUME ["/opt/odoo/data/"]
diff --git a/get_addons b/get_addons
new file mode 100644
index 0000000000000000000000000000000000000000..258f62882d403266c049781517cbb8c424b9fd5d
--- /dev/null
+++ b/get_addons
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+ODOO_ROOT_DIR=${ODOO_ROOT_DIR:-'/opt/odoo'}
+SAVE_COMMITS_DIR=${SAVE_COMMITS_DIR:-'/opt/odoo_commits'}
+SAVE_COMMITS_FILENAME=${SAVE_COMMITS_FILENAME:-'custom_addons'}
+
+save_commit() {
+ repo="$1"
+ commit="$2"
+ module="$3"
+ dst="$4"
+ echo "${repo};${commit};${module};${dst}" >> "${SAVE_COMMITS_DIR}/${SAVE_COMMITS_FILENAME}"
+}
+
+repo="$1"
+shift
+ref="$1"
+shift
+dst="$1"
+shift
+modules="$@"
+
+git clone "${repo}" /tmp/repo
+git -C /tmp/repo checkout "${ref}"
+commit="$(git -C /tmp/repo rev-parse HEAD)"
+if [ -n "$modules" ]; then
+ for module in $modules; do
+ mv "/tmp/repo/${module}" "${ODOO_ROOT_DIR}/${dst}/"
+ save_commit "$repo" "$commit" "$module" "$dst"
+ done
+else
+ module="$(basename $dst)"
+ mkdir -p "/${ODOO_ROOT_DIR}/${dst}"
+ mv /tmp/repo/* "${ODOO_ROOT_DIR}/${dst}/"
+ save_commit "$repo" "$commit" "$module" "$dst"
+fi
+rm -r /tmp/repo