diff --git a/14.0.Dockerfile b/14.0.Dockerfile index 44959ed28623556268065676ccce0a0100244fd6..41d432f2da7d6f10dd1846c6e7bb34e405eb9722 100644 --- a/14.0.Dockerfile +++ b/14.0.Dockerfile @@ -1,12 +1,10 @@ FROM python:3.9-slim-buster MAINTAINER Le Filament <https://le-filament.com> -ARG SAVE_COMMITS_DIR='/opt/odoo_commits/' ENV APT_DEPS='build-essential libldap2-dev libpq-dev libsasl2-dev' \ LANG=C.UTF-8 \ LC_ALL=C.UTF-8 \ - PGDATABASE=odoo \ - SAVE_COMMITS_DIR=$SAVE_COMMITS_DIR + PGDATABASE=odoo RUN set -x; \ apt-get update &&\ @@ -31,6 +29,9 @@ RUN set -x; \ apt-get -y autoremove &&\ rm -rf /var/lib/apt/lists/* wkhtmltox.deb +ARG SAVE_COMMITS_DIR='/opt/odoo_commits/' +ENV SAVE_COMMITS_DIR=$SAVE_COMMITS_DIR + # Add Git Known Hosts COPY ./ssh_known_git_hosts /root/.ssh/known_hosts @@ -38,10 +39,11 @@ COPY ./ssh_known_git_hosts /root/.ssh/known_hosts ARG SAVE_COMMITS_FILENAME='ocb' RUN set -x; \ repo='https://github.com/OCA/OCB' \ + branch='14.0' \ && 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 '14.0' --depth 1 "${repo}" /tmp/repo \ + && git clone --single-branch --branch "${branch}" --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 \