From b32f2033d1e2bc2ca501eac0b4df79cd49632de7 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 8 Oct 2019 08:35:11 +0200 Subject: [PATCH 001/208] [REM] Odoo 10.0: remove deprecated version --- 10.0/Dockerfile | 72 ---------------------------------------------- 10.0/entrypoint.sh | 42 --------------------------- 10.0/odoo.conf | 37 ------------------------ 3 files changed, 151 deletions(-) delete mode 100644 10.0/Dockerfile delete mode 100755 10.0/entrypoint.sh delete mode 100644 10.0/odoo.conf diff --git a/10.0/Dockerfile b/10.0/Dockerfile deleted file mode 100644 index f334fe586..000000000 --- a/10.0/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -FROM debian:jessie -LABEL maintainer="Odoo S.A. " - -# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN set -x; \ - apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - dirmngr \ - node-less \ - python-gevent \ - python-ldap \ - python-pip \ - python-qrcode \ - python-renderpm \ - python-support \ - python-vobject \ - python-watchdog \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.jessie_amd64.deb \ - && echo '4d104ff338dc2d2083457b3b1e9baab8ddf14202 wkhtmltox.deb' | sha1sum -c - \ - && dpkg --force-depends -i wkhtmltox.deb \ - && apt-get -y install -f --no-install-recommends \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false npm \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb \ - && pip install psycogreen==1.0 - -# install latest postgresql-client -RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' > etc/apt/sources.list.d/pgdg.list \ - && export GNUPGHOME="$(mktemp -d)" \ - && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ - && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --armor --export "${repokey}" | apt-key add - \ - && rm -rf "$GNUPGHOME" \ - && apt-get update \ - && apt-get install -y postgresql-client \ - && rm -rf /var/lib/apt/lists/* - -# Install Odoo -ENV ODOO_VERSION 10.0 -ARG ODOO_RELEASE=20190816 -ARG ODOO_SHA=397cb4d458cb292edb0432dc8d39a466dce56b65 -RUN set -x; \ - curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ - && dpkg --force-depends -i odoo.deb \ - && apt-get update \ - && apt-get -y install -f --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* odoo.deb - -# Copy entrypoint script and Odoo configuration file -COPY ./entrypoint.sh / -COPY ./odoo.conf /etc/odoo/ -RUN chown odoo /etc/odoo/odoo.conf - -# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons -RUN mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons -VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] - -# Expose Odoo services -EXPOSE 8069 8071 - -# Set the default config file -ENV ODOO_RC /etc/odoo/odoo.conf - -# Set default user when running the container -USER odoo - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["odoo"] diff --git a/10.0/entrypoint.sh b/10.0/entrypoint.sh deleted file mode 100755 index 4f0ef5993..000000000 --- a/10.0/entrypoint.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -set -e - -# set the postgres database host, port, user and password according to the environment -# and pass them as arguments to the odoo process if not present in the config file -: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} -: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} -: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} - -DB_ARGS=() -function check_config() { - param="$1" - value="$2" - if ! grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then - DB_ARGS+=("--${param}") - DB_ARGS+=("${value}") - fi; -} -check_config "db_host" "$HOST" -check_config "db_port" "$PORT" -check_config "db_user" "$USER" -check_config "db_password" "$PASSWORD" - -case "$1" in - -- | odoo) - shift - if [[ "$1" == "scaffold" ]] ; then - exec odoo "$@" - else - exec odoo "$@" "${DB_ARGS[@]}" - fi - ;; - -*) - exec odoo "$@" "${DB_ARGS[@]}" - ;; - *) - exec "$@" -esac - -exit 1 diff --git a/10.0/odoo.conf b/10.0/odoo.conf deleted file mode 100644 index c3769ceb0..000000000 --- a/10.0/odoo.conf +++ /dev/null @@ -1,37 +0,0 @@ -[options] -addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/odoo/addons -data_dir = /var/lib/odoo -; admin_passwd = admin -; csv_internal_sep = , -; db_maxconn = 64 -; db_name = False -; db_template = template1 -; dbfilter = .* -; debug_mode = False -; email_from = False -; limit_memory_hard = 2684354560 -; limit_memory_soft = 2147483648 -; limit_request = 8192 -; limit_time_cpu = 60 -; limit_time_real = 120 -; list_db = True -; log_db = False -; log_handler = [':INFO'] -; log_level = info -; logfile = None -; longpolling_port = 8072 -; max_cron_threads = 2 -; osv_memory_age_limit = 1.0 -; osv_memory_count_limit = False -; smtp_password = False -; smtp_port = 25 -; smtp_server = localhost -; smtp_ssl = False -; smtp_user = False -; workers = 0 -; xmlrpc = True -; xmlrpc_interface = -; xmlrpc_port = 8069 -; xmlrpcs = True -; xmlrpcs_interface = -; xmlrpcs_port = 8071 From 6e7938ab6a5ebfb795433dc523b7121d1d9042d3 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 9 Oct 2019 13:30:39 +0200 Subject: [PATCH 002/208] [ADD] Odoo: 13.0 * Add Odoo version 13.0 release 20191009 --- 13.0/Dockerfile | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 13.0/entrypoint.sh | 42 +++++++++++++++++++++++ 13.0/odoo.conf | 37 +++++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 13.0/Dockerfile create mode 100755 13.0/entrypoint.sh create mode 100644 13.0/odoo.conf diff --git a/13.0/Dockerfile b/13.0/Dockerfile new file mode 100644 index 000000000..52efac972 --- /dev/null +++ b/13.0/Dockerfile @@ -0,0 +1,83 @@ +FROM debian:buster +LABEL maintainer="Odoo S.A. " + +# Generate locale C.UTF-8 for postgres and general locale data +ENV LANG C.UTF-8 + +# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf +RUN set -x; \ + apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + dirmngr \ + fonts-noto-cjk \ + gnupg \ + libssl-dev \ + node-less \ + npm \ + python3-pip \ + python3-pyldap \ + python3-qrcode \ + python3-renderpm \ + python3-setuptools \ + python3-vobject \ + python3-watchdog \ + xz-utils \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ + && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ + && dpkg --force-depends -i wkhtmltox.deb\ + && apt-get -y install -f --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb + +# install latest postgresql-client +RUN set -x; \ + echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > etc/apt/sources.list.d/pgdg.list \ + && export GNUPGHOME="$(mktemp -d)" \ + && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ + && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ + && gpg --armor --export "${repokey}" | apt-key add - \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && apt-get update \ + && apt-get install -y postgresql-client \ + && rm -rf /var/lib/apt/lists/* + +# Install rtlcss (on Debian buster) +RUN set -x; \ + npm install -g rtlcss + +# Install Odoo +ENV ODOO_VERSION 13.0 +ARG ODOO_RELEASE=20191009 +ARG ODOO_SHA=468633ffd7ebacdde116e8708fd62f74788cd2b1 +RUN set -x; \ + curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ + && dpkg --force-depends -i odoo.deb \ + && apt-get update \ + && apt-get -y install -f --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* odoo.deb + +# Copy entrypoint script and Odoo configuration file +RUN pip3 install num2words xlwt +COPY ./entrypoint.sh / +COPY ./odoo.conf /etc/odoo/ +RUN chown odoo /etc/odoo/odoo.conf + +# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons +RUN mkdir -p /mnt/extra-addons \ + && chown -R odoo /mnt/extra-addons +VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] + +# Expose Odoo services +EXPOSE 8069 8071 + +# Set the default config file +ENV ODOO_RC /etc/odoo/odoo.conf + +# Set default user when running the container +USER odoo + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["odoo"] diff --git a/13.0/entrypoint.sh b/13.0/entrypoint.sh new file mode 100755 index 000000000..4f0ef5993 --- /dev/null +++ b/13.0/entrypoint.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +set -e + +# set the postgres database host, port, user and password according to the environment +# and pass them as arguments to the odoo process if not present in the config file +: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} + +DB_ARGS=() +function check_config() { + param="$1" + value="$2" + if ! grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then + DB_ARGS+=("--${param}") + DB_ARGS+=("${value}") + fi; +} +check_config "db_host" "$HOST" +check_config "db_port" "$PORT" +check_config "db_user" "$USER" +check_config "db_password" "$PASSWORD" + +case "$1" in + -- | odoo) + shift + if [[ "$1" == "scaffold" ]] ; then + exec odoo "$@" + else + exec odoo "$@" "${DB_ARGS[@]}" + fi + ;; + -*) + exec odoo "$@" "${DB_ARGS[@]}" + ;; + *) + exec "$@" +esac + +exit 1 diff --git a/13.0/odoo.conf b/13.0/odoo.conf new file mode 100644 index 000000000..28f70c105 --- /dev/null +++ b/13.0/odoo.conf @@ -0,0 +1,37 @@ +[options] +addons_path = /mnt/extra-addons +data_dir = /var/lib/odoo +; admin_passwd = admin +; csv_internal_sep = , +; db_maxconn = 64 +; db_name = False +; db_template = template1 +; dbfilter = .* +; debug_mode = False +; email_from = False +; limit_memory_hard = 2684354560 +; limit_memory_soft = 2147483648 +; limit_request = 8192 +; limit_time_cpu = 60 +; limit_time_real = 120 +; list_db = True +; log_db = False +; log_handler = [':INFO'] +; log_level = info +; logfile = None +; longpolling_port = 8072 +; max_cron_threads = 2 +; osv_memory_age_limit = 1.0 +; osv_memory_count_limit = False +; smtp_password = False +; smtp_port = 25 +; smtp_server = localhost +; smtp_ssl = False +; smtp_user = False +; workers = 0 +; xmlrpc = True +; xmlrpc_interface = +; xmlrpc_port = 8069 +; xmlrpcs = True +; xmlrpcs_interface = +; xmlrpcs_port = 8071 From 06604959547561e417b400341a3501d36cc7c8a0 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 9 Oct 2019 14:25:48 +0200 Subject: [PATCH 003/208] [REF] Odoo 11.0-12.0: update to release 20191009 --- 11.0/Dockerfile | 4 ++-- 12.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 4f6b9307a..3dc65d6b4 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -44,8 +44,8 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 11.0 -ARG ODOO_RELEASE=20190816 -ARG ODOO_SHA=948e097925bfbba8ffd9682c2d0555dc9b539c0a +ARG ODOO_RELEASE=20191009 +ARG ODOO_SHA=20f17b7c6c7206cc799c652964d09d4a27a22715 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index a983e422b..0b643ec24 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -58,8 +58,8 @@ RUN set -x;\ # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20190816 -ARG ODOO_SHA=e95cdfe23d16a8572b63bc8d8e8616be5bc18a0a +ARG ODOO_RELEASE=20191009 +ARG ODOO_SHA=5f3623139c43c71b11dca6a87aaa0def0cf865d8 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ From 6ba07c93c397b64825c8d0ba0c46cd24c3155f42 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 10 Oct 2019 17:03:46 +0200 Subject: [PATCH 004/208] [FIX] 11.0-13.0: remove deprecated label usage --- 11.0/Dockerfile | 2 +- 12.0/Dockerfile | 2 +- 13.0/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 3dc65d6b4..99421e30f 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -1,5 +1,5 @@ FROM debian:stretch -LABEL maintainer="Odoo S.A. " +MAINTAINER Odoo S.A. # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 0b643ec24..cb96a8db6 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -1,5 +1,5 @@ FROM debian:stretch -LABEL maintainer="Odoo S.A. " +MAINTAINER Odoo S.A. # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 52efac972..4dc24e41c 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -1,5 +1,5 @@ FROM debian:buster -LABEL maintainer="Odoo S.A. " +MAINTAINER Odoo S.A. # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 From 9409487426e5556f31bb1293ba63b6138d53cfe8 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 9 Oct 2019 14:25:19 +0200 Subject: [PATCH 005/208] [FIX] 11.0-13.0: install phonenumbers and use slim images While phonenumbers is not required to run Odoo, it's a requested nice to have. To avoid a red warning while installing num2words with pip, the Debian backport repository is used. Also use Debian slim images to gain some space. closes #245 and closes #168 --- 11.0/Dockerfile | 9 +++++++-- 12.0/Dockerfile | 9 +++++++-- 13.0/Dockerfile | 6 ++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 99421e30f..aca47f47e 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -1,9 +1,12 @@ -FROM debian:stretch +FROM debian:stretch-slim MAINTAINER Odoo S.A. # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 +# Use backports to avoid install some libs with pip +RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list + # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf RUN set -x; \ apt-get update \ @@ -15,13 +18,16 @@ RUN set -x; \ gnupg \ libssl1.0-dev \ node-less \ + python3-num2words \ python3-pip \ + python3-phonenumbers \ python3-pyldap \ python3-qrcode \ python3-renderpm \ python3-setuptools \ python3-vobject \ python3-watchdog \ + python3-xlwt \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ @@ -55,7 +61,6 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file -RUN pip3 install num2words xlwt COPY ./entrypoint.sh / COPY ./odoo.conf /etc/odoo/ RUN chown odoo /etc/odoo/odoo.conf diff --git a/12.0/Dockerfile b/12.0/Dockerfile index cb96a8db6..3442b537b 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -1,9 +1,12 @@ -FROM debian:stretch +FROM debian:stretch-slim MAINTAINER Odoo S.A. # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 +# Use backports to avoid install some libs with pip +RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list + # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf RUN set -x; \ apt-get update \ @@ -15,13 +18,16 @@ RUN set -x; \ gnupg \ libssl1.0-dev \ node-less \ + python3-num2words \ python3-pip \ + python3-phonenumbers \ python3-pyldap \ python3-qrcode \ python3-renderpm \ python3-setuptools \ python3-vobject \ python3-watchdog \ + python3-xlwt \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ @@ -69,7 +75,6 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file -RUN pip3 install num2words xlwt COPY ./entrypoint.sh / COPY ./odoo.conf /etc/odoo/ RUN chown odoo /etc/odoo/odoo.conf diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 4dc24e41c..e5525d0a9 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster +FROM debian:buster-slim MAINTAINER Odoo S.A. # Generate locale C.UTF-8 for postgres and general locale data @@ -16,13 +16,16 @@ RUN set -x; \ libssl-dev \ node-less \ npm \ + python3-num2words \ python3-pip \ + python3-phonenumbers \ python3-pyldap \ python3-qrcode \ python3-renderpm \ python3-setuptools \ python3-vobject \ python3-watchdog \ + python3-xlwt \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ @@ -60,7 +63,6 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file -RUN pip3 install num2words xlwt COPY ./entrypoint.sh / COPY ./odoo.conf /etc/odoo/ RUN chown odoo /etc/odoo/odoo.conf From c1fbc53720789928437cfc0caedc3cf894e98765 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 10 Oct 2019 16:49:31 +0200 Subject: [PATCH 006/208] [FIX] 11.0-13.0: use gpg batch mode Without batch option, gpg may try to use /dev/tty. See https://bugs.debian.org/913614 --- 11.0/Dockerfile | 2 +- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index aca47f47e..706c9969e 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -41,7 +41,7 @@ RUN set -x; \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --armor --export "${repokey}" | apt-key add - \ + && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ && gpgconf --kill all \ && rm -rf "$GNUPGHOME" \ && apt-get update \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 3442b537b..60f7736d4 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -41,7 +41,7 @@ RUN set -x; \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --armor --export "${repokey}" | apt-key add - \ + && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ && gpgconf --kill all \ && rm -rf "$GNUPGHOME" \ && apt-get update \ @@ -54,7 +54,7 @@ RUN set -x;\ && export GNUPGHOME="$(mktemp -d)" \ && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --armor --export "${repokey}" | apt-key add - \ + && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/nodejs.gpg.asc \ && gpgconf --kill all \ && rm -rf "$GNUPGHOME" \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index e5525d0a9..03475900d 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -39,7 +39,7 @@ RUN set -x; \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --armor --export "${repokey}" | apt-key add - \ + && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ && gpgconf --kill all \ && rm -rf "$GNUPGHOME" \ && apt-get update \ From f126d72f664e1844ce35bf46b7b43a46d56e3fd5 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 10 Oct 2019 16:52:15 +0200 Subject: [PATCH 007/208] [FIX] 11.0-13.0: use apt-get to install wkhtmltopdf Usage of apt-get should prevent installing wkhtmltopdf on wrong architecture. --- 11.0/Dockerfile | 3 +-- 12.0/Dockerfile | 3 +-- 13.0/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 706c9969e..f8f56c8ad 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -31,8 +31,7 @@ RUN set -x; \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ - && dpkg --force-depends -i wkhtmltox.deb\ - && apt-get -y install -f --no-install-recommends \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 60f7736d4..8103ab620 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -31,8 +31,7 @@ RUN set -x; \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ - && dpkg --force-depends -i wkhtmltox.deb\ - && apt-get -y install -f --no-install-recommends \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 03475900d..44d25bd52 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -29,8 +29,7 @@ RUN set -x; \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ - && dpkg --force-depends -i wkhtmltox.deb\ - && apt-get -y install -f --no-install-recommends \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client From 14e51ae334564952c8e07b047351eabfaeee5bb9 Mon Sep 17 00:00:00 2001 From: rbuisson Date: Tue, 16 Jul 2019 15:16:04 +0200 Subject: [PATCH 008/208] [IMP] 11.0-13.0: Wait for PostgreSQL before starting Odoo In some situations, like when a docker compose file use a data volume to persist postgresql databases, the Odoo server starts and tries to connect to database server before the postgresql server is ready. In such a case, the Odoo containers fails to start. With this commit, the wait-for-it script is used to wait for the database server service to be ready before starting Odoo. This script is available as a Debian package. Closes #258, closes #259 --- 11.0/Dockerfile | 1 + 11.0/entrypoint.sh | 3 +++ 12.0/Dockerfile | 1 + 12.0/entrypoint.sh | 3 +++ 13.0/Dockerfile | 1 + 13.0/entrypoint.sh | 3 +++ 6 files changed, 12 insertions(+) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index f8f56c8ad..080e08d62 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -13,6 +13,7 @@ RUN set -x; \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ + wait-for-it \ dirmngr \ fonts-noto-cjk \ gnupg \ diff --git a/11.0/entrypoint.sh b/11.0/entrypoint.sh index 4f0ef5993..b6401f71f 100755 --- a/11.0/entrypoint.sh +++ b/11.0/entrypoint.sh @@ -23,6 +23,9 @@ check_config "db_port" "$PORT" check_config "db_user" "$USER" check_config "db_password" "$PASSWORD" +# Wait for the database to be up +wait-for-it $HOST:$PORT --timeout=60 -- sleep 5s + case "$1" in -- | odoo) shift diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 8103ab620..6f8f85f6c 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -13,6 +13,7 @@ RUN set -x; \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ + wait-for-it \ dirmngr \ fonts-noto-cjk \ gnupg \ diff --git a/12.0/entrypoint.sh b/12.0/entrypoint.sh index 4f0ef5993..b6401f71f 100755 --- a/12.0/entrypoint.sh +++ b/12.0/entrypoint.sh @@ -23,6 +23,9 @@ check_config "db_port" "$PORT" check_config "db_user" "$USER" check_config "db_password" "$PASSWORD" +# Wait for the database to be up +wait-for-it $HOST:$PORT --timeout=60 -- sleep 5s + case "$1" in -- | odoo) shift diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 44d25bd52..ea22d900c 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -10,6 +10,7 @@ RUN set -x; \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ + wait-for-it \ dirmngr \ fonts-noto-cjk \ gnupg \ diff --git a/13.0/entrypoint.sh b/13.0/entrypoint.sh index 4f0ef5993..b6401f71f 100755 --- a/13.0/entrypoint.sh +++ b/13.0/entrypoint.sh @@ -23,6 +23,9 @@ check_config "db_port" "$PORT" check_config "db_user" "$USER" check_config "db_password" "$PASSWORD" +# Wait for the database to be up +wait-for-it $HOST:$PORT --timeout=60 -- sleep 5s + case "$1" in -- | odoo) shift From 19c672588152e953258dc59270ef06685f243d0f Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 22 Oct 2019 13:26:30 +0200 Subject: [PATCH 009/208] [REF] Odoo 11.0-13.0: update to release 20191022 --- 11.0/Dockerfile | 4 ++-- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 080e08d62..361c76a31 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -50,8 +50,8 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 11.0 -ARG ODOO_RELEASE=20191009 -ARG ODOO_SHA=20f17b7c6c7206cc799c652964d09d4a27a22715 +ARG ODOO_RELEASE=20191022 +ARG ODOO_SHA=eea3333a3d7402c4ff63a09d9da145a6a4a3bab2 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 6f8f85f6c..cfa69a6f8 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -64,8 +64,8 @@ RUN set -x;\ # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20191009 -ARG ODOO_SHA=5f3623139c43c71b11dca6a87aaa0def0cf865d8 +ARG ODOO_RELEASE=20191022 +ARG ODOO_SHA=31cdde4a9f6cd9d2cbf6af45a5d301e0a0907148 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index ea22d900c..7a1b3ffba 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -52,8 +52,8 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20191009 -ARG ODOO_SHA=468633ffd7ebacdde116e8708fd62f74788cd2b1 +ARG ODOO_RELEASE=20191022 +ARG ODOO_SHA=09eb205ed1e4348dd4762263cafa9819e17dba7e RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ From ffe62bdd52f88ac85f54064e6eb02aa38f88f58d Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 23 Oct 2019 15:35:01 +0200 Subject: [PATCH 010/208] [FIX] Odoo 11.0-12.0: replace wait-for-it script As the wait-for-it script is started before the parsing of the command line, it is always started. It can be a problem if a user wants to start some other binary than odoo (for example a shell). Also, the wait-for-it script is only checking if a port is open on a host and then waits 5 seconds before starting Odoo. With this commit, the wait-for-it script is replaced by a more useful custom python script that checks if the postgresql server is able to handle a connection with the given parameters. Odoo then starts whenever it's ready or fails after a 30 sec timeout. --- 11.0/Dockerfile | 3 ++- 11.0/entrypoint.sh | 5 ++--- 11.0/wait-for-psql.py | 32 ++++++++++++++++++++++++++++++++ 12.0/Dockerfile | 3 ++- 12.0/entrypoint.sh | 5 ++--- 12.0/wait-for-psql.py | 32 ++++++++++++++++++++++++++++++++ 13.0/Dockerfile | 3 ++- 13.0/entrypoint.sh | 5 ++--- 13.0/wait-for-psql.py | 32 ++++++++++++++++++++++++++++++++ 9 files changed, 108 insertions(+), 12 deletions(-) create mode 100755 11.0/wait-for-psql.py create mode 100755 12.0/wait-for-psql.py create mode 100755 13.0/wait-for-psql.py diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 361c76a31..6f84e463b 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -13,7 +13,6 @@ RUN set -x; \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ - wait-for-it \ dirmngr \ fonts-noto-cjk \ gnupg \ @@ -76,6 +75,8 @@ EXPOSE 8069 8071 # Set the default config file ENV ODOO_RC /etc/odoo/odoo.conf +COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py + # Set default user when running the container USER odoo diff --git a/11.0/entrypoint.sh b/11.0/entrypoint.sh index b6401f71f..5638e6d39 100755 --- a/11.0/entrypoint.sh +++ b/11.0/entrypoint.sh @@ -23,19 +23,18 @@ check_config "db_port" "$PORT" check_config "db_user" "$USER" check_config "db_password" "$PASSWORD" -# Wait for the database to be up -wait-for-it $HOST:$PORT --timeout=60 -- sleep 5s - case "$1" in -- | odoo) shift if [[ "$1" == "scaffold" ]] ; then exec odoo "$@" else + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 exec odoo "$@" "${DB_ARGS[@]}" fi ;; -*) + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 exec odoo "$@" "${DB_ARGS[@]}" ;; *) diff --git a/11.0/wait-for-psql.py b/11.0/wait-for-psql.py new file mode 100755 index 000000000..a55f44098 --- /dev/null +++ b/11.0/wait-for-psql.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 +import argparse +import psycopg2 +import sys +import time + + +if __name__ == '__main__': + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument('--db_host', required=True) + arg_parser.add_argument('--db_port', required=True) + arg_parser.add_argument('--db_user', required=True) + arg_parser.add_argument('--db_password', required=True) + arg_parser.add_argument('--timeout', type=int, default=5) + + args = arg_parser.parse_args() + + start_time = time.time() + while (time.time() - start_time) < args.timeout: + try: + conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') + error = '' + break + except psycopg2.OperationalError as e: + error = e + else: + conn.close() + time.sleep(1) + + if error: + print("Database connection failure: %s" % error, file=sys.stderr) + sys.exit(1) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index cfa69a6f8..a93334a81 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -13,7 +13,6 @@ RUN set -x; \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ - wait-for-it \ dirmngr \ fonts-noto-cjk \ gnupg \ @@ -90,6 +89,8 @@ EXPOSE 8069 8071 # Set the default config file ENV ODOO_RC /etc/odoo/odoo.conf +COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py + # Set default user when running the container USER odoo diff --git a/12.0/entrypoint.sh b/12.0/entrypoint.sh index b6401f71f..5638e6d39 100755 --- a/12.0/entrypoint.sh +++ b/12.0/entrypoint.sh @@ -23,19 +23,18 @@ check_config "db_port" "$PORT" check_config "db_user" "$USER" check_config "db_password" "$PASSWORD" -# Wait for the database to be up -wait-for-it $HOST:$PORT --timeout=60 -- sleep 5s - case "$1" in -- | odoo) shift if [[ "$1" == "scaffold" ]] ; then exec odoo "$@" else + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 exec odoo "$@" "${DB_ARGS[@]}" fi ;; -*) + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 exec odoo "$@" "${DB_ARGS[@]}" ;; *) diff --git a/12.0/wait-for-psql.py b/12.0/wait-for-psql.py new file mode 100755 index 000000000..a55f44098 --- /dev/null +++ b/12.0/wait-for-psql.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 +import argparse +import psycopg2 +import sys +import time + + +if __name__ == '__main__': + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument('--db_host', required=True) + arg_parser.add_argument('--db_port', required=True) + arg_parser.add_argument('--db_user', required=True) + arg_parser.add_argument('--db_password', required=True) + arg_parser.add_argument('--timeout', type=int, default=5) + + args = arg_parser.parse_args() + + start_time = time.time() + while (time.time() - start_time) < args.timeout: + try: + conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') + error = '' + break + except psycopg2.OperationalError as e: + error = e + else: + conn.close() + time.sleep(1) + + if error: + print("Database connection failure: %s" % error, file=sys.stderr) + sys.exit(1) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 7a1b3ffba..d20372e8a 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -10,7 +10,6 @@ RUN set -x; \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ - wait-for-it \ dirmngr \ fonts-noto-cjk \ gnupg \ @@ -78,6 +77,8 @@ EXPOSE 8069 8071 # Set the default config file ENV ODOO_RC /etc/odoo/odoo.conf +COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py + # Set default user when running the container USER odoo diff --git a/13.0/entrypoint.sh b/13.0/entrypoint.sh index b6401f71f..5638e6d39 100755 --- a/13.0/entrypoint.sh +++ b/13.0/entrypoint.sh @@ -23,19 +23,18 @@ check_config "db_port" "$PORT" check_config "db_user" "$USER" check_config "db_password" "$PASSWORD" -# Wait for the database to be up -wait-for-it $HOST:$PORT --timeout=60 -- sleep 5s - case "$1" in -- | odoo) shift if [[ "$1" == "scaffold" ]] ; then exec odoo "$@" else + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 exec odoo "$@" "${DB_ARGS[@]}" fi ;; -*) + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 exec odoo "$@" "${DB_ARGS[@]}" ;; *) diff --git a/13.0/wait-for-psql.py b/13.0/wait-for-psql.py new file mode 100755 index 000000000..a55f44098 --- /dev/null +++ b/13.0/wait-for-psql.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 +import argparse +import psycopg2 +import sys +import time + + +if __name__ == '__main__': + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument('--db_host', required=True) + arg_parser.add_argument('--db_port', required=True) + arg_parser.add_argument('--db_user', required=True) + arg_parser.add_argument('--db_password', required=True) + arg_parser.add_argument('--timeout', type=int, default=5) + + args = arg_parser.parse_args() + + start_time = time.time() + while (time.time() - start_time) < args.timeout: + try: + conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') + error = '' + break + except psycopg2.OperationalError as e: + error = e + else: + conn.close() + time.sleep(1) + + if error: + print("Database connection failure: %s" % error, file=sys.stderr) + sys.exit(1) From 9c3a2dd128af4dde270f7248deb18a99b50d4072 Mon Sep 17 00:00:00 2001 From: Anang Aji Rahmawan Date: Sat, 26 Oct 2019 01:46:46 +0700 Subject: [PATCH 011/208] [FIX] Odoo 11.0-13.0: get database config value --- 11.0/entrypoint.sh | 11 ++++++----- 12.0/entrypoint.sh | 9 +++++---- 13.0/entrypoint.sh | 9 +++++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/11.0/entrypoint.sh b/11.0/entrypoint.sh index 5638e6d39..8e7626ddd 100755 --- a/11.0/entrypoint.sh +++ b/11.0/entrypoint.sh @@ -12,11 +12,12 @@ set -e DB_ARGS=() function check_config() { param="$1" - value="$2" - if ! grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then - DB_ARGS+=("--${param}") - DB_ARGS+=("${value}") - fi; + value="$2" + if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then + value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') + fi; + DB_ARGS+=("--${param}") + DB_ARGS+=("${value}") } check_config "db_host" "$HOST" check_config "db_port" "$PORT" diff --git a/12.0/entrypoint.sh b/12.0/entrypoint.sh index 5638e6d39..6dd42c414 100755 --- a/12.0/entrypoint.sh +++ b/12.0/entrypoint.sh @@ -13,10 +13,11 @@ DB_ARGS=() function check_config() { param="$1" value="$2" - if ! grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then - DB_ARGS+=("--${param}") - DB_ARGS+=("${value}") - fi; + if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then + value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') + fi; + DB_ARGS+=("--${param}") + DB_ARGS+=("${value}") } check_config "db_host" "$HOST" check_config "db_port" "$PORT" diff --git a/13.0/entrypoint.sh b/13.0/entrypoint.sh index 5638e6d39..6dd42c414 100755 --- a/13.0/entrypoint.sh +++ b/13.0/entrypoint.sh @@ -13,10 +13,11 @@ DB_ARGS=() function check_config() { param="$1" value="$2" - if ! grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then - DB_ARGS+=("--${param}") - DB_ARGS+=("${value}") - fi; + if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then + value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') + fi; + DB_ARGS+=("--${param}") + DB_ARGS+=("${value}") } check_config "db_host" "$HOST" check_config "db_port" "$PORT" From 596a7cabc07dd3b1d18b6c2832cace7328e36969 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 6 Nov 2019 16:40:29 +0100 Subject: [PATCH 012/208] [REF] Odoo 11.0-13.0: update to release 20191106 --- 11.0/Dockerfile | 4 ++-- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 6f84e463b..3084bab40 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -49,8 +49,8 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 11.0 -ARG ODOO_RELEASE=20191022 -ARG ODOO_SHA=eea3333a3d7402c4ff63a09d9da145a6a4a3bab2 +ARG ODOO_RELEASE=20191106 +ARG ODOO_SHA=d6da6c631fb9926c4440f2016d623c37fa38d4ea RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index a93334a81..3f8d3152d 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -63,8 +63,8 @@ RUN set -x;\ # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20191022 -ARG ODOO_SHA=31cdde4a9f6cd9d2cbf6af45a5d301e0a0907148 +ARG ODOO_RELEASE=20191106 +ARG ODOO_SHA=8dd3d36bd371b1eb6fbeb9ff7b049c8aea84327c RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index d20372e8a..9ff05c7f8 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -51,8 +51,8 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20191022 -ARG ODOO_SHA=09eb205ed1e4348dd4762263cafa9819e17dba7e +ARG ODOO_RELEASE=20191106 +ARG ODOO_SHA=b13bec4d20dfe36f1baa923719e37ea6bbe18a7d RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ From b82980338d237cde0b6ca737e0f3313ce7a7f458 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 21 Jan 2020 10:26:17 +0100 Subject: [PATCH 013/208] [REF] Odoo 11.0-13.0: update to release 20200121 --- 11.0/Dockerfile | 4 ++-- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 3084bab40..31b58c6a4 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -49,8 +49,8 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 11.0 -ARG ODOO_RELEASE=20191106 -ARG ODOO_SHA=d6da6c631fb9926c4440f2016d623c37fa38d4ea +ARG ODOO_RELEASE=20200121 +ARG ODOO_SHA=13f30434cb4fb28b11d78fd4e7c616d03362f779 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 3f8d3152d..d375a06ed 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -63,8 +63,8 @@ RUN set -x;\ # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20191106 -ARG ODOO_SHA=8dd3d36bd371b1eb6fbeb9ff7b049c8aea84327c +ARG ODOO_RELEASE=20200121 +ARG ODOO_SHA=cb0bcb5d239983468c2e3b3f7cf17f58df820b1c RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 9ff05c7f8..f99aab5a6 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -51,8 +51,8 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20191106 -ARG ODOO_SHA=b13bec4d20dfe36f1baa923719e37ea6bbe18a7d +ARG ODOO_RELEASE=20200121 +ARG ODOO_SHA=770d71cfafb9a8f8419b88f8033b964d5742ad57 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ From 740e5dc53dcfddcf325cc3a22b6ac6477f24672b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 21 Jan 2020 10:33:48 +0100 Subject: [PATCH 014/208] [FIX] Odoo 11.0-13.0: use an absolute path for psql source list When creating an apt source list for Postgresql Debian package, the redirection uses a relative path. It works because the default WORKDIR but it's a fragile bad practice. Thanks to @fractalf and @alorence for the bug report and investigation. closes #287, closes #290 --- 11.0/Dockerfile | 2 +- 12.0/Dockerfile | 2 +- 13.0/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 31b58c6a4..ece4776c2 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -36,7 +36,7 @@ RUN set -x; \ # install latest postgresql-client RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \ + echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index d375a06ed..7b00d8eda 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -36,7 +36,7 @@ RUN set -x; \ # install latest postgresql-client RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \ + echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index f99aab5a6..18b3c8f87 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -34,7 +34,7 @@ RUN set -x; \ # install latest postgresql-client RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > etc/apt/sources.list.d/pgdg.list \ + echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ From 6011cc7931c36b5e3bfb2caca17749e005146f73 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 21 Jan 2020 16:20:23 +0100 Subject: [PATCH 015/208] [FIX] Odoo 11.0-13.0: add xlrd library to allow xls import Fixes #262 --- 11.0/Dockerfile | 1 + 12.0/Dockerfile | 1 + 13.0/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index ece4776c2..a69daed93 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -27,6 +27,7 @@ RUN set -x; \ python3-setuptools \ python3-vobject \ python3-watchdog \ + python3-xlrd \ python3-xlwt \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 7b00d8eda..7dd07c4b4 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -27,6 +27,7 @@ RUN set -x; \ python3-setuptools \ python3-vobject \ python3-watchdog \ + python3-xlrd \ python3-xlwt \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 18b3c8f87..c25f01138 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -25,6 +25,7 @@ RUN set -x; \ python3-setuptools \ python3-vobject \ python3-watchdog \ + python3-xlrd \ python3-xlwt \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ From 0c835c74852ce8f722a3fd06d03bcfd927719889 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 22 Jan 2020 15:57:16 +0100 Subject: [PATCH 016/208] [IMP] Odoo 11.0-13.0: remove a RUN layer Small improvement to minimze the number of layers. Thanks to @valerianpereira for the PR. Closes #188 --- 11.0/Dockerfile | 6 +++--- 12.0/Dockerfile | 6 +++--- 13.0/Dockerfile | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index a69daed93..44d389cf9 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -63,11 +63,11 @@ RUN set -x; \ # Copy entrypoint script and Odoo configuration file COPY ./entrypoint.sh / COPY ./odoo.conf /etc/odoo/ -RUN chown odoo /etc/odoo/odoo.conf # Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons -RUN mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons +RUN chown odoo /etc/odoo/odoo.conf \ + && mkdir -p /mnt/extra-addons \ + && chown -R odoo /mnt/extra-addons VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] # Expose Odoo services diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 7dd07c4b4..acf092a71 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -77,11 +77,11 @@ RUN set -x; \ # Copy entrypoint script and Odoo configuration file COPY ./entrypoint.sh / COPY ./odoo.conf /etc/odoo/ -RUN chown odoo /etc/odoo/odoo.conf # Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons -RUN mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons +RUN chown odoo /etc/odoo/odoo.conf \ + && mkdir -p /mnt/extra-addons \ + && chown -R odoo /mnt/extra-addons VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] # Expose Odoo services diff --git a/13.0/Dockerfile b/13.0/Dockerfile index c25f01138..ec42aa69e 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -65,11 +65,11 @@ RUN set -x; \ # Copy entrypoint script and Odoo configuration file COPY ./entrypoint.sh / COPY ./odoo.conf /etc/odoo/ -RUN chown odoo /etc/odoo/odoo.conf -# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons -RUN mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons +# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons +RUN chown odoo /etc/odoo/odoo.conf \ + && mkdir -p /mnt/extra-addons \ + && chown -R odoo /mnt/extra-addons VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] # Expose Odoo services From 6d92142da193f60c161f97eea1079f437dd51d7e Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 23 Jan 2020 14:32:55 +0100 Subject: [PATCH 017/208] [IMP] Odoo 11.0-13.0: install python-slugify The Odoo's fallback for the slugify_one method does only support latin letters. This commit installs the python-slugify library from the Debian packages. Closes #199 Thanks to @lem8r for the report and PR. --- 11.0/Dockerfile | 1 + 12.0/Dockerfile | 1 + 13.0/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 44d389cf9..6131128ab 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -25,6 +25,7 @@ RUN set -x; \ python3-qrcode \ python3-renderpm \ python3-setuptools \ + python3-slugify \ python3-vobject \ python3-watchdog \ python3-xlrd \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index acf092a71..d180d6a36 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -25,6 +25,7 @@ RUN set -x; \ python3-qrcode \ python3-renderpm \ python3-setuptools \ + python3-slugify \ python3-vobject \ python3-watchdog \ python3-xlrd \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index ec42aa69e..8627f223e 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -23,6 +23,7 @@ RUN set -x; \ python3-qrcode \ python3-renderpm \ python3-setuptools \ + python3-slugify \ python3-vobject \ python3-watchdog \ python3-xlrd \ From b4779b0e56be7264735dc9bf1bd837dca8f0d89e Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 31 Mar 2020 15:39:25 +0200 Subject: [PATCH 018/208] [IMP] Odoo 11.0-13.0: also exports port 8072 Although the `EXPOSE` instruction does not actually publish the ports, it has an impact on inter docker communication. With this commit, port 8072 is also exposed. Closes #107 --- 11.0/Dockerfile | 2 +- 12.0/Dockerfile | 2 +- 13.0/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 6131128ab..3d3a2446c 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -72,7 +72,7 @@ RUN chown odoo /etc/odoo/odoo.conf \ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] # Expose Odoo services -EXPOSE 8069 8071 +EXPOSE 8069 8071 8072 # Set the default config file ENV ODOO_RC /etc/odoo/odoo.conf diff --git a/12.0/Dockerfile b/12.0/Dockerfile index d180d6a36..13510d3a3 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -86,7 +86,7 @@ RUN chown odoo /etc/odoo/odoo.conf \ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] # Expose Odoo services -EXPOSE 8069 8071 +EXPOSE 8069 8071 8072 # Set the default config file ENV ODOO_RC /etc/odoo/odoo.conf diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 8627f223e..da31f5dd2 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -74,7 +74,7 @@ RUN chown odoo /etc/odoo/odoo.conf \ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] # Expose Odoo services -EXPOSE 8069 8071 +EXPOSE 8069 8071 8072 # Set the default config file ENV ODOO_RC /etc/odoo/odoo.conf From d38f9ccc04a60121d45bb9a33d87930b5a5cd3df Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 17 Apr 2020 11:07:57 +0200 Subject: [PATCH 019/208] [REF] Odoo 11.0-13.0: update to release 20200417 Closes #298 --- 11.0/Dockerfile | 4 ++-- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 3d3a2446c..1d313cab9 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -51,8 +51,8 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 11.0 -ARG ODOO_RELEASE=20200121 -ARG ODOO_SHA=13f30434cb4fb28b11d78fd4e7c616d03362f779 +ARG ODOO_RELEASE=20200417 +ARG ODOO_SHA=e21c34a263785eea09babd7a0d876ba05c841935 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 13510d3a3..790f436e4 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -65,8 +65,8 @@ RUN set -x;\ # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20200121 -ARG ODOO_SHA=cb0bcb5d239983468c2e3b3f7cf17f58df820b1c +ARG ODOO_RELEASE=20200417 +ARG ODOO_SHA=ca4a7485b0b75850ffe1458a8f3266839400a501 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index da31f5dd2..4df42f5e3 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -53,8 +53,8 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20200121 -ARG ODOO_SHA=770d71cfafb9a8f8419b88f8033b964d5742ad57 +ARG ODOO_RELEASE=20200417 +ARG ODOO_SHA=db29fbcebf63f9f656e9445f462190ac775ee533 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ From 9323219289a159fbc3b0bf0281962c3655189444 Mon Sep 17 00:00:00 2001 From: Andris Date: Sun, 2 Feb 2020 17:20:40 +0100 Subject: [PATCH 020/208] [FIX] Odoo 11.0-13.0: install odoo deb in one pass Before this commit, the deb package was installed in two steps. The first step was to use dpkg and force the install, the second step was to repair the broken install. --- 11.0/Dockerfile | 3 +-- 12.0/Dockerfile | 3 +-- 13.0/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 1d313cab9..482b08af1 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -56,9 +56,8 @@ ARG ODOO_SHA=e21c34a263785eea09babd7a0d876ba05c841935 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ - && dpkg --force-depends -i odoo.deb \ && apt-get update \ - && apt-get -y install -f --no-install-recommends \ + && apt-get -y install --no-install-recommends ./odoo.deb\ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 790f436e4..a8b680d47 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -70,9 +70,8 @@ ARG ODOO_SHA=ca4a7485b0b75850ffe1458a8f3266839400a501 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ - && dpkg --force-depends -i odoo.deb \ && apt-get update \ - && apt-get -y install -f --no-install-recommends \ + && apt-get -y install --no-install-recommends ./odoo.deb \ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 4df42f5e3..11789fbca 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -58,9 +58,8 @@ ARG ODOO_SHA=db29fbcebf63f9f656e9445f462190ac775ee533 RUN set -x; \ curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ - && dpkg --force-depends -i odoo.deb \ && apt-get update \ - && apt-get -y install -f --no-install-recommends \ + && apt-get -y install --no-install-recommends ./odoo.deb \ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file From 3e06fdf97d0105362fdfff42fc8a271b4f4cc9db Mon Sep 17 00:00:00 2001 From: Andris Date: Sun, 2 Feb 2020 16:03:29 +0100 Subject: [PATCH 021/208] [FIX] Odoo 11.0-13.0: set the default shell to bash It appears that dash can be unpredictable. Also, uses the `pipefail` as stated in the Dockerfile best practice [1]. [1] https://github.com/docker/docker.github.io/blob/master/develop/develop-images/dockerfile_best-practices.md#using-pipes --- 11.0/Dockerfile | 11 +++++------ 12.0/Dockerfile | 14 ++++++-------- 13.0/Dockerfile | 14 ++++++-------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 482b08af1..505bc9a4b 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -1,6 +1,8 @@ FROM debian:stretch-slim MAINTAINER Odoo S.A. +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 @@ -8,8 +10,7 @@ ENV LANG C.UTF-8 RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN set -x; \ - apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ @@ -37,8 +38,7 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client -RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ @@ -53,8 +53,7 @@ RUN set -x; \ ENV ODOO_VERSION 11.0 ARG ODOO_RELEASE=20200417 ARG ODOO_SHA=e21c34a263785eea09babd7a0d876ba05c841935 -RUN set -x; \ - curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ && apt-get -y install --no-install-recommends ./odoo.deb\ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index a8b680d47..20d432155 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -1,6 +1,8 @@ FROM debian:stretch-slim MAINTAINER Odoo S.A. +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 @@ -8,8 +10,7 @@ ENV LANG C.UTF-8 RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN set -x; \ - apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ @@ -37,8 +38,7 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client -RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ @@ -50,8 +50,7 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* # Install rtlcss (on Debian stretch) -RUN set -x;\ - echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \ +RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ @@ -67,8 +66,7 @@ RUN set -x;\ ENV ODOO_VERSION 12.0 ARG ODOO_RELEASE=20200417 ARG ODOO_SHA=ca4a7485b0b75850ffe1458a8f3266839400a501 -RUN set -x; \ - curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ && apt-get -y install --no-install-recommends ./odoo.deb \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 11789fbca..f11a88cc1 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -1,12 +1,13 @@ FROM debian:buster-slim MAINTAINER Odoo S.A. +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN set -x; \ - apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ @@ -35,8 +36,7 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client -RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ @@ -48,15 +48,13 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* # Install rtlcss (on Debian buster) -RUN set -x; \ - npm install -g rtlcss +RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 ARG ODOO_RELEASE=20200417 ARG ODOO_SHA=db29fbcebf63f9f656e9445f462190ac775ee533 -RUN set -x; \ - curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ && apt-get -y install --no-install-recommends ./odoo.deb \ From 91a9019df72754210493d840132a94e1bc32bed7 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 17 Apr 2020 14:12:06 +0200 Subject: [PATCH 022/208] [IMP] Odoo 11.0-13.0: avoid to install unnecessary packages --- 11.0/Dockerfile | 2 +- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 505bc9a4b..640224a10 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -46,7 +46,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc && gpgconf --kill all \ && rm -rf "$GNUPGHOME" \ && apt-get update \ - && apt-get install -y postgresql-client \ + && apt-get install --no-install-recommends -y postgresql-client \ && rm -rf /var/lib/apt/lists/* # Install Odoo diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 20d432155..887762f36 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -46,7 +46,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc && gpgconf --kill all \ && rm -rf "$GNUPGHOME" \ && apt-get update \ - && apt-get install -y postgresql-client \ + && apt-get install --no-install-recommends -y postgresql-client \ && rm -rf /var/lib/apt/lists/* # Install rtlcss (on Debian stretch) @@ -58,7 +58,7 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source && gpgconf --kill all \ && rm -rf "$GNUPGHOME" \ && apt-get update \ - && apt-get install -y nodejs \ + && apt-get install --no-install-recommends -y nodejs \ && npm install -g rtlcss \ && rm -rf /var/lib/apt/lists/* diff --git a/13.0/Dockerfile b/13.0/Dockerfile index f11a88cc1..b1bb1f54c 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -44,7 +44,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/ && gpgconf --kill all \ && rm -rf "$GNUPGHOME" \ && apt-get update \ - && apt-get install -y postgresql-client \ + && apt-get install --no-install-recommends -y postgresql-client \ && rm -rf /var/lib/apt/lists/* # Install rtlcss (on Debian buster) From 22ddf056d53bdab8d398d6a28cfef76ed955eca0 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 17 Apr 2020 14:48:23 +0200 Subject: [PATCH 023/208] [IMP] Odoo 11.0-13.0: avoid masking return value of mktemp --- 11.0/Dockerfile | 3 ++- 12.0/Dockerfile | 6 ++++-- 13.0/Dockerfile | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 640224a10..015fbf260 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -39,7 +39,8 @@ RUN apt-get update \ # install latest postgresql-client RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && export GNUPGHOME="$(mktemp -d)" \ + && GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 887762f36..791890bcc 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -39,7 +39,8 @@ RUN apt-get update \ # install latest postgresql-client RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && export GNUPGHOME="$(mktemp -d)" \ + && GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ @@ -51,7 +52,8 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc # Install rtlcss (on Debian stretch) RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \ - && export GNUPGHOME="$(mktemp -d)" \ + && GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/nodejs.gpg.asc \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index b1bb1f54c..9213acd32 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -37,7 +37,8 @@ RUN apt-get update \ # install latest postgresql-client RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && export GNUPGHOME="$(mktemp -d)" \ + && GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ From f116a674ca62595d0fbf1ded206ec2e4d962ebf0 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 17 Apr 2020 16:15:25 +0200 Subject: [PATCH 024/208] [FIX] Odoo 11.0-13.0: remove postgres source list after usage When installing postgresql-client, the Debian repo from Postgresql is added as a source list. As a consequence, when installing the Odoo debian packages, the package dependencies are also searched in the Postgresql repo. In this case, it appears that python3-werkzeug version 0.16 was installed from the Postgresql repo. Closes #299 --- 11.0/Dockerfile | 1 + 12.0/Dockerfile | 1 + 13.0/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 015fbf260..57ab85931 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -48,6 +48,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc && rm -rf "$GNUPGHOME" \ && apt-get update \ && apt-get install --no-install-recommends -y postgresql-client \ + && rm -f /etc/apt/sources.list.d/pgdg.list \ && rm -rf /var/lib/apt/lists/* # Install Odoo diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 791890bcc..26d607107 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -48,6 +48,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc && rm -rf "$GNUPGHOME" \ && apt-get update \ && apt-get install --no-install-recommends -y postgresql-client \ + && rm -f /etc/apt/sources.list.d/pgdg.list \ && rm -rf /var/lib/apt/lists/* # Install rtlcss (on Debian stretch) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 9213acd32..9ec1be308 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -46,6 +46,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/ && rm -rf "$GNUPGHOME" \ && apt-get update \ && apt-get install --no-install-recommends -y postgresql-client \ + && rm -f /etc/apt/sources.list.d/pgdg.list \ && rm -rf /var/lib/apt/lists/* # Install rtlcss (on Debian buster) From b4c45baf1f0579c654129ac9efe99a929569dab6 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 29 Jun 2020 10:10:05 +0200 Subject: [PATCH 025/208] [REF] Odoo 11.0-13.0: update to release 20200629 --- 11.0/Dockerfile | 4 ++-- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 57ab85931..f69e02938 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -53,8 +53,8 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc # Install Odoo ENV ODOO_VERSION 11.0 -ARG ODOO_RELEASE=20200417 -ARG ODOO_SHA=e21c34a263785eea09babd7a0d876ba05c841935 +ARG ODOO_RELEASE=20200629 +ARG ODOO_SHA=3c9c5bb32d7d878b246624a4dfc233080a2b5888 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 26d607107..2e1a5bac9 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20200417 -ARG ODOO_SHA=ca4a7485b0b75850ffe1458a8f3266839400a501 +ARG ODOO_RELEASE=20200629 +ARG ODOO_SHA=3c334ba4178b346839679895468ca786bcce9b5f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 9ec1be308..439076957 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20200417 -ARG ODOO_SHA=db29fbcebf63f9f656e9445f462190ac775ee533 +ARG ODOO_RELEASE=20200629 +ARG ODOO_SHA=1d86e2728a65ed2c9f6ea9b6b893df878f75599e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 1bddcda4b2ef30c7443ebe0cae43d17f92aa43cd Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 26 Aug 2020 08:11:51 +0200 Subject: [PATCH 026/208] [REF] Odoo 11.0-13.0: update to release 20200826 --- 11.0/Dockerfile | 4 ++-- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index f69e02938..37fdf9543 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -53,8 +53,8 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc # Install Odoo ENV ODOO_VERSION 11.0 -ARG ODOO_RELEASE=20200629 -ARG ODOO_SHA=3c9c5bb32d7d878b246624a4dfc233080a2b5888 +ARG ODOO_RELEASE=20200826 +ARG ODOO_SHA=cf5c3c766ba42861ede4ec9b4027dfc910818a01 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 2e1a5bac9..f989c1db8 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20200629 -ARG ODOO_SHA=3c334ba4178b346839679895468ca786bcce9b5f +ARG ODOO_RELEASE=20200826 +ARG ODOO_SHA=3acc73ce5dfbe550d6ad617a4078b0a5d160f9db RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 439076957..794c06993 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20200629 -ARG ODOO_SHA=1d86e2728a65ed2c9f6ea9b6b893df878f75599e +ARG ODOO_RELEASE=20200826 +ARG ODOO_SHA=9fe7d55e64867d177519e99cc45f9ecfeb3746a3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 61f98599836b3f37d40423be916e8390bfe1bf67 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 2 Oct 2020 09:23:03 +0200 Subject: [PATCH 027/208] [REM] Odoo 11.0: remove unmaintained version --- 11.0/Dockerfile | 86 ------------------------------------------- 11.0/entrypoint.sh | 45 ---------------------- 11.0/odoo.conf | 37 ------------------- 11.0/wait-for-psql.py | 32 ---------------- 4 files changed, 200 deletions(-) delete mode 100644 11.0/Dockerfile delete mode 100755 11.0/entrypoint.sh delete mode 100644 11.0/odoo.conf delete mode 100755 11.0/wait-for-psql.py diff --git a/11.0/Dockerfile b/11.0/Dockerfile deleted file mode 100644 index 37fdf9543..000000000 --- a/11.0/Dockerfile +++ /dev/null @@ -1,86 +0,0 @@ -FROM debian:stretch-slim -MAINTAINER Odoo S.A. - -SHELL ["/bin/bash", "-xo", "pipefail", "-c"] - -# Generate locale C.UTF-8 for postgres and general locale data -ENV LANG C.UTF-8 - -# Use backports to avoid install some libs with pip -RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list - -# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - dirmngr \ - fonts-noto-cjk \ - gnupg \ - libssl1.0-dev \ - node-less \ - python3-num2words \ - python3-pip \ - python3-phonenumbers \ - python3-pyldap \ - python3-qrcode \ - python3-renderpm \ - python3-setuptools \ - python3-slugify \ - python3-vobject \ - python3-watchdog \ - python3-xlrd \ - python3-xlwt \ - xz-utils \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ - && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ - && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb - -# install latest postgresql-client -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ - && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && apt-get update \ - && apt-get install --no-install-recommends -y postgresql-client \ - && rm -f /etc/apt/sources.list.d/pgdg.list \ - && rm -rf /var/lib/apt/lists/* - -# Install Odoo -ENV ODOO_VERSION 11.0 -ARG ODOO_RELEASE=20200826 -ARG ODOO_SHA=cf5c3c766ba42861ede4ec9b4027dfc910818a01 -RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ - && apt-get update \ - && apt-get -y install --no-install-recommends ./odoo.deb\ - && rm -rf /var/lib/apt/lists/* odoo.deb - -# Copy entrypoint script and Odoo configuration file -COPY ./entrypoint.sh / -COPY ./odoo.conf /etc/odoo/ - -# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons -RUN chown odoo /etc/odoo/odoo.conf \ - && mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons -VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] - -# Expose Odoo services -EXPOSE 8069 8071 8072 - -# Set the default config file -ENV ODOO_RC /etc/odoo/odoo.conf - -COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py - -# Set default user when running the container -USER odoo - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["odoo"] diff --git a/11.0/entrypoint.sh b/11.0/entrypoint.sh deleted file mode 100755 index 8e7626ddd..000000000 --- a/11.0/entrypoint.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -set -e - -# set the postgres database host, port, user and password according to the environment -# and pass them as arguments to the odoo process if not present in the config file -: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} -: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} -: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} - -DB_ARGS=() -function check_config() { - param="$1" - value="$2" - if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then - value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') - fi; - DB_ARGS+=("--${param}") - DB_ARGS+=("${value}") -} -check_config "db_host" "$HOST" -check_config "db_port" "$PORT" -check_config "db_user" "$USER" -check_config "db_password" "$PASSWORD" - -case "$1" in - -- | odoo) - shift - if [[ "$1" == "scaffold" ]] ; then - exec odoo "$@" - else - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - fi - ;; - -*) - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - ;; - *) - exec "$@" -esac - -exit 1 diff --git a/11.0/odoo.conf b/11.0/odoo.conf deleted file mode 100644 index 28f70c105..000000000 --- a/11.0/odoo.conf +++ /dev/null @@ -1,37 +0,0 @@ -[options] -addons_path = /mnt/extra-addons -data_dir = /var/lib/odoo -; admin_passwd = admin -; csv_internal_sep = , -; db_maxconn = 64 -; db_name = False -; db_template = template1 -; dbfilter = .* -; debug_mode = False -; email_from = False -; limit_memory_hard = 2684354560 -; limit_memory_soft = 2147483648 -; limit_request = 8192 -; limit_time_cpu = 60 -; limit_time_real = 120 -; list_db = True -; log_db = False -; log_handler = [':INFO'] -; log_level = info -; logfile = None -; longpolling_port = 8072 -; max_cron_threads = 2 -; osv_memory_age_limit = 1.0 -; osv_memory_count_limit = False -; smtp_password = False -; smtp_port = 25 -; smtp_server = localhost -; smtp_ssl = False -; smtp_user = False -; workers = 0 -; xmlrpc = True -; xmlrpc_interface = -; xmlrpc_port = 8069 -; xmlrpcs = True -; xmlrpcs_interface = -; xmlrpcs_port = 8071 diff --git a/11.0/wait-for-psql.py b/11.0/wait-for-psql.py deleted file mode 100755 index a55f44098..000000000 --- a/11.0/wait-for-psql.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import psycopg2 -import sys -import time - - -if __name__ == '__main__': - arg_parser = argparse.ArgumentParser() - arg_parser.add_argument('--db_host', required=True) - arg_parser.add_argument('--db_port', required=True) - arg_parser.add_argument('--db_user', required=True) - arg_parser.add_argument('--db_password', required=True) - arg_parser.add_argument('--timeout', type=int, default=5) - - args = arg_parser.parse_args() - - start_time = time.time() - while (time.time() - start_time) < args.timeout: - try: - conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') - error = '' - break - except psycopg2.OperationalError as e: - error = e - else: - conn.close() - time.sleep(1) - - if error: - print("Database connection failure: %s" % error, file=sys.stderr) - sys.exit(1) From 52216118ac593881d02c94f66d2221331060aa76 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 2 Oct 2020 14:27:06 +0200 Subject: [PATCH 028/208] [REF] Odoo 12.0-13.0: bump to release 20201002 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index f989c1db8..273aa15e5 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20200826 -ARG ODOO_SHA=3acc73ce5dfbe550d6ad617a4078b0a5d160f9db +ARG ODOO_RELEASE=20201002 +ARG ODOO_SHA=c0412c5a5e45d010aed165107d513b4e6e1b2f5f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 794c06993..df5234bec 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20200826 -ARG ODOO_SHA=9fe7d55e64867d177519e99cc45f9ecfeb3746a3 +ARG ODOO_RELEASE=20201002 +ARG ODOO_SHA=4df562a3f643c42e90c4c648128dafd98d73f887 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 0ffdd00409846901e9f877165c143c985ebc4016 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 2 Oct 2020 14:28:06 +0200 Subject: [PATCH 029/208] [ADD] Odoo: 14.0 --- 14.0/Dockerfile | 88 +++++++++++++++++++++++++++++++++++++++++++ 14.0/entrypoint.sh | 45 ++++++++++++++++++++++ 14.0/odoo.conf | 37 ++++++++++++++++++ 14.0/wait-for-psql.py | 32 ++++++++++++++++ 4 files changed, 202 insertions(+) create mode 100644 14.0/Dockerfile create mode 100755 14.0/entrypoint.sh create mode 100644 14.0/odoo.conf create mode 100755 14.0/wait-for-psql.py diff --git a/14.0/Dockerfile b/14.0/Dockerfile new file mode 100644 index 000000000..7dd7b1701 --- /dev/null +++ b/14.0/Dockerfile @@ -0,0 +1,88 @@ +FROM debian:buster-slim +MAINTAINER Odoo S.A. + +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + +# Generate locale C.UTF-8 for postgres and general locale data +ENV LANG C.UTF-8 + +# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + dirmngr \ + fonts-noto-cjk \ + gnupg \ + libssl-dev \ + node-less \ + npm \ + python3-num2words \ + python3-pdfminer \ + python3-pip \ + python3-phonenumbers \ + python3-pyldap \ + python3-qrcode \ + python3-renderpm \ + python3-setuptools \ + python3-slugify \ + python3-vobject \ + python3-watchdog \ + python3-xlrd \ + python3-xlwt \ + xz-utils \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ + && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb + +# install latest postgresql-client +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ + && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ + && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ + && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && apt-get update \ + && apt-get install --no-install-recommends -y postgresql-client \ + && rm -f /etc/apt/sources.list.d/pgdg.list \ + && rm -rf /var/lib/apt/lists/* + +# Install rtlcss (on Debian buster) +RUN npm install -g rtlcss + +# Install Odoo +ENV ODOO_VERSION 14.0 +ARG ODOO_RELEASE=20201002 +ARG ODOO_SHA=70917e1db8d100c791f31afbfcd782dd026bd4c9 +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ + && apt-get update \ + && apt-get -y install --no-install-recommends ./odoo.deb \ + && rm -rf /var/lib/apt/lists/* odoo.deb + +# Copy entrypoint script and Odoo configuration file +COPY ./entrypoint.sh / +COPY ./odoo.conf /etc/odoo/ + +# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons +RUN chown odoo /etc/odoo/odoo.conf \ + && mkdir -p /mnt/extra-addons \ + && chown -R odoo /mnt/extra-addons +VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] + +# Expose Odoo services +EXPOSE 8069 8071 8072 + +# Set the default config file +ENV ODOO_RC /etc/odoo/odoo.conf + +COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py + +# Set default user when running the container +USER odoo + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["odoo"] diff --git a/14.0/entrypoint.sh b/14.0/entrypoint.sh new file mode 100755 index 000000000..6dd42c414 --- /dev/null +++ b/14.0/entrypoint.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +set -e + +# set the postgres database host, port, user and password according to the environment +# and pass them as arguments to the odoo process if not present in the config file +: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} + +DB_ARGS=() +function check_config() { + param="$1" + value="$2" + if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then + value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') + fi; + DB_ARGS+=("--${param}") + DB_ARGS+=("${value}") +} +check_config "db_host" "$HOST" +check_config "db_port" "$PORT" +check_config "db_user" "$USER" +check_config "db_password" "$PASSWORD" + +case "$1" in + -- | odoo) + shift + if [[ "$1" == "scaffold" ]] ; then + exec odoo "$@" + else + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + fi + ;; + -*) + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + ;; + *) + exec "$@" +esac + +exit 1 diff --git a/14.0/odoo.conf b/14.0/odoo.conf new file mode 100644 index 000000000..28f70c105 --- /dev/null +++ b/14.0/odoo.conf @@ -0,0 +1,37 @@ +[options] +addons_path = /mnt/extra-addons +data_dir = /var/lib/odoo +; admin_passwd = admin +; csv_internal_sep = , +; db_maxconn = 64 +; db_name = False +; db_template = template1 +; dbfilter = .* +; debug_mode = False +; email_from = False +; limit_memory_hard = 2684354560 +; limit_memory_soft = 2147483648 +; limit_request = 8192 +; limit_time_cpu = 60 +; limit_time_real = 120 +; list_db = True +; log_db = False +; log_handler = [':INFO'] +; log_level = info +; logfile = None +; longpolling_port = 8072 +; max_cron_threads = 2 +; osv_memory_age_limit = 1.0 +; osv_memory_count_limit = False +; smtp_password = False +; smtp_port = 25 +; smtp_server = localhost +; smtp_ssl = False +; smtp_user = False +; workers = 0 +; xmlrpc = True +; xmlrpc_interface = +; xmlrpc_port = 8069 +; xmlrpcs = True +; xmlrpcs_interface = +; xmlrpcs_port = 8071 diff --git a/14.0/wait-for-psql.py b/14.0/wait-for-psql.py new file mode 100755 index 000000000..a55f44098 --- /dev/null +++ b/14.0/wait-for-psql.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 +import argparse +import psycopg2 +import sys +import time + + +if __name__ == '__main__': + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument('--db_host', required=True) + arg_parser.add_argument('--db_port', required=True) + arg_parser.add_argument('--db_user', required=True) + arg_parser.add_argument('--db_password', required=True) + arg_parser.add_argument('--timeout', type=int, default=5) + + args = arg_parser.parse_args() + + start_time = time.time() + while (time.time() - start_time) < args.timeout: + try: + conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') + error = '' + break + except psycopg2.OperationalError as e: + error = e + else: + conn.close() + time.sleep(1) + + if error: + print("Database connection failure: %s" % error, file=sys.stderr) + sys.exit(1) From d9e5b758fc2d33303b148a9d9d885a02482981b4 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 12 Oct 2020 14:13:23 +0200 Subject: [PATCH 030/208] [REF] Odoo 12.0-14.0: update to release 20201012 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 273aa15e5..7517a2ab4 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20201002 -ARG ODOO_SHA=c0412c5a5e45d010aed165107d513b4e6e1b2f5f +ARG ODOO_RELEASE=20201012 +ARG ODOO_SHA=0d5aa5f1d0249863b04c06a5cb8ec8587ac522da RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index df5234bec..d0075b8c5 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20201002 -ARG ODOO_SHA=4df562a3f643c42e90c4c648128dafd98d73f887 +ARG ODOO_RELEASE=20201012 +ARG ODOO_SHA=30bfb107a331975c09c73faeac692993313515b4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 7dd7b1701..7b7f468de 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20201002 -ARG ODOO_SHA=70917e1db8d100c791f31afbfcd782dd026bd4c9 +ARG ODOO_RELEASE=20201012 +ARG ODOO_SHA=3d559b066ee2fd8e5a84e8f00ad510dbf2e3df63 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From d6dec44be9d5efa4ef6f0ea0547ffcffa4bcf54a Mon Sep 17 00:00:00 2001 From: Denny Biasiolli Date: Mon, 12 Oct 2020 16:05:18 +0200 Subject: [PATCH 031/208] [FIX] Odoo 12.0-13.0: fixing wkhtmltopdf package url using `buster` package instead of `stretch` --- 13.0/Dockerfile | 2 +- 14.0/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index d0075b8c5..511523dee 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get update \ python3-xlrd \ python3-xlwt \ xz-utils \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 7b7f468de..48633794d 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update && \ python3-xlrd \ python3-xlwt \ xz-utils \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb From 01aed14a6dd1dc93463442e556263e99658e5235 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 19 Oct 2020 09:50:34 +0200 Subject: [PATCH 032/208] [FIX] Odoo 13.0-14.0: update wkhtmltox sha1 sum Oversight in PR #327. Closes #328 --- 13.0/Dockerfile | 2 +- 14.0/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 511523dee..4e85c23f6 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update \ python3-xlwt \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ - && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ + && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 48633794d..64024c316 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -32,7 +32,7 @@ RUN apt-get update && \ python3-xlwt \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ - && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ + && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb From b5260037cb051a032ff505eba408996d6783a8cc Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 26 Oct 2020 11:45:44 +0100 Subject: [PATCH 033/208] [REF] Odoo 12.0-14.0: update to release 20201026 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 7517a2ab4..0cf1119be 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20201012 -ARG ODOO_SHA=0d5aa5f1d0249863b04c06a5cb8ec8587ac522da +ARG ODOO_RELEASE=20201026 +ARG ODOO_SHA=848d079fdfa76f57bd742c3385096d6743c9532e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 4e85c23f6..0e4ec119a 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20201012 -ARG ODOO_SHA=30bfb107a331975c09c73faeac692993313515b4 +ARG ODOO_RELEASE=20201026 +ARG ODOO_SHA=d3f043345c04674bba81762d0afd88dab52aab36 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 64024c316..5f6eb4a03 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20201012 -ARG ODOO_SHA=3d559b066ee2fd8e5a84e8f00ad510dbf2e3df63 +ARG ODOO_RELEASE=20201026 +ARG ODOO_SHA=f03d267d3a055dbc798b799efbfcb1eb9a739b23 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 867c2ae68426b3fe32481ff8a6216e1a989e86b7 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 12 Nov 2020 09:01:38 +0100 Subject: [PATCH 034/208] [REF] Odoo 12.0-14.0: update to release 20201112 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 0cf1119be..47709c0a1 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20201026 -ARG ODOO_SHA=848d079fdfa76f57bd742c3385096d6743c9532e +ARG ODOO_RELEASE=20201112 +ARG ODOO_SHA=9f0b063fa41a15410fec4afcc513a1e27c1150fa RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 0e4ec119a..991f3cc0b 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20201026 -ARG ODOO_SHA=d3f043345c04674bba81762d0afd88dab52aab36 +ARG ODOO_RELEASE=20201112 +ARG ODOO_SHA=5658d799122aac82ab07dc55e6af28a35adda3ea RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 5f6eb4a03..480ddecbc 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20201026 -ARG ODOO_SHA=f03d267d3a055dbc798b799efbfcb1eb9a739b23 +ARG ODOO_RELEASE=20201112 +ARG ODOO_SHA=1ab9abfb9193486aed1886146fe253af6d18d601 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 920582ed7794c142ef888f3142c1afa7013b4f38 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 23 Nov 2020 14:31:16 +0100 Subject: [PATCH 035/208] [REF] Odoo 12.0-14.0: update to release 20201123 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 47709c0a1..4c632175f 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20201112 -ARG ODOO_SHA=9f0b063fa41a15410fec4afcc513a1e27c1150fa +ARG ODOO_RELEASE=20201123 +ARG ODOO_SHA=ee05f5fb87fd762219a882eecc95c80569c7f3da RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 991f3cc0b..835625870 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20201112 -ARG ODOO_SHA=5658d799122aac82ab07dc55e6af28a35adda3ea +ARG ODOO_RELEASE=20201123 +ARG ODOO_SHA=1af64956f215ba0a2991ac6c86b98610c480c17b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 480ddecbc..1e9b014b9 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20201112 -ARG ODOO_SHA=1ab9abfb9193486aed1886146fe253af6d18d601 +ARG ODOO_RELEASE=20201123 +ARG ODOO_SHA=bbcefc0cd5b5aa2285a577118f918742bac670c4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From a825afde09db9b5c3c4a0faae782c0381b13b68c Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 8 Dec 2020 10:25:53 +0100 Subject: [PATCH 036/208] [REF] Odoo 12.0-14.0: update to release 20201208 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 4c632175f..0e0e02613 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20201123 -ARG ODOO_SHA=ee05f5fb87fd762219a882eecc95c80569c7f3da +ARG ODOO_RELEASE=20201208 +ARG ODOO_SHA=9b055f129756442f58fce0b3d819be4a0e61709e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 835625870..a124eed9a 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20201123 -ARG ODOO_SHA=1af64956f215ba0a2991ac6c86b98610c480c17b +ARG ODOO_RELEASE=20201208 +ARG ODOO_SHA=acb26cf02f554009ba99510acc5631d29616dd10 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 1e9b014b9..7e770c966 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20201123 -ARG ODOO_SHA=bbcefc0cd5b5aa2285a577118f918742bac670c4 +ARG ODOO_RELEASE=20201208 +ARG ODOO_SHA=37dd5d71d5b8439fddf88d7e161cc3502721c4b5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From b23832c33a63bc2ffae024a3602dedb6965cd06d Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 18 Dec 2020 15:22:14 +0100 Subject: [PATCH 037/208] [REF] Odoo 12.0-14.0: update to release 20201218 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 0e0e02613..0d0a6e2a9 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20201208 -ARG ODOO_SHA=9b055f129756442f58fce0b3d819be4a0e61709e +ARG ODOO_RELEASE=20201218 +ARG ODOO_SHA=c26bc7a3df829bf7e01eae0fb54a5c9d1dbe56ab RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index a124eed9a..feacf2da7 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20201208 -ARG ODOO_SHA=acb26cf02f554009ba99510acc5631d29616dd10 +ARG ODOO_RELEASE=20201218 +ARG ODOO_SHA=44cff0f8fe5b54cdf7887c388dccf7d462790ccc RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 7e770c966..22329e02e 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20201208 -ARG ODOO_SHA=37dd5d71d5b8439fddf88d7e161cc3502721c4b5 +ARG ODOO_RELEASE=20201218 +ARG ODOO_SHA=cd893ce96b3bf7e3448f2414f4537685f521acd8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 5bf43c28934f7a445b36cf411e11967daefcc0f4 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 4 Jan 2021 08:24:26 +0100 Subject: [PATCH 038/208] [REF] Odoo 12.0-14.0: update to release 20210104 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 0d0a6e2a9..b10c1aec6 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20201218 -ARG ODOO_SHA=c26bc7a3df829bf7e01eae0fb54a5c9d1dbe56ab +ARG ODOO_RELEASE=20210104 +ARG ODOO_SHA=d2d08a4c0dfac6b1aeeb616d9c948eb441876670 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index feacf2da7..58d763d21 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20201218 -ARG ODOO_SHA=44cff0f8fe5b54cdf7887c388dccf7d462790ccc +ARG ODOO_RELEASE=20210104 +ARG ODOO_SHA=15b85a12eb661426316e255cfc888a1ca0914db1 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 22329e02e..8882bc60b 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20201218 -ARG ODOO_SHA=cd893ce96b3bf7e3448f2414f4537685f521acd8 +ARG ODOO_RELEASE=20210104 +ARG ODOO_SHA=4f669f6ef2e7474aa1bda52d9d5c25f1ee678520 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 8b937ea8137b0630526e059a2e790fd8acc740c3 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 11 Jan 2021 09:01:19 +0100 Subject: [PATCH 039/208] [REF] Odoo 12.0-14.0: update to release 20210111 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index b10c1aec6..2813ebf8d 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210104 -ARG ODOO_SHA=d2d08a4c0dfac6b1aeeb616d9c948eb441876670 +ARG ODOO_RELEASE=20210111 +ARG ODOO_SHA=73dd74d0185588fbe052471217b28c1f796a542c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 58d763d21..e73963eb3 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210104 -ARG ODOO_SHA=15b85a12eb661426316e255cfc888a1ca0914db1 +ARG ODOO_RELEASE=20210111 +ARG ODOO_SHA=0d5d6cac754a61713d9a6e0bb226a51fee70941b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 8882bc60b..5b7497d71 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210104 -ARG ODOO_SHA=4f669f6ef2e7474aa1bda52d9d5c25f1ee678520 +ARG ODOO_RELEASE=20210111 +ARG ODOO_SHA=dc97e990bfabf167159a16fbf7437f7490bab46b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 44a0a3f1b32e72b55079fb1a6a05efdbda248bfe Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 4 Feb 2021 11:20:42 +0100 Subject: [PATCH 040/208] [REF] Odoo 12.0-14.0: update to release 20210204 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 2813ebf8d..91cddecce 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210111 -ARG ODOO_SHA=73dd74d0185588fbe052471217b28c1f796a542c +ARG ODOO_RELEASE=20210204 +ARG ODOO_SHA=fe07cca16f6c2045f3adbc4470098d4b54fccfc6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index e73963eb3..ab8cdc51e 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210111 -ARG ODOO_SHA=0d5d6cac754a61713d9a6e0bb226a51fee70941b +ARG ODOO_RELEASE=20210204 +ARG ODOO_SHA=6b81cdf3ed67143010cc8fd6bfce71aa70febca8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 5b7497d71..7d6007284 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210111 -ARG ODOO_SHA=dc97e990bfabf167159a16fbf7437f7490bab46b +ARG ODOO_RELEASE=20210204 +ARG ODOO_SHA=2483855a8323e27f623bc664afc4b4470787cfdd RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 6fb83876d016fcdcae40853c8e0d405dac7feaef Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 10 Feb 2021 09:57:03 +0100 Subject: [PATCH 041/208] [REF] Odoo 12.0-14.0: update to release 20210210 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 91cddecce..b3e67aade 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210204 -ARG ODOO_SHA=fe07cca16f6c2045f3adbc4470098d4b54fccfc6 +ARG ODOO_RELEASE=20210210 +ARG ODOO_SHA=5dbafa58ade2b5f6222bb0126bff0c31c61fe7f9 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index ab8cdc51e..5b9355eda 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210204 -ARG ODOO_SHA=6b81cdf3ed67143010cc8fd6bfce71aa70febca8 +ARG ODOO_RELEASE=20210210 +ARG ODOO_SHA=27e67879f5d193ec1af235d8450e46eec79deb5a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 7d6007284..97e5c32f3 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210204 -ARG ODOO_SHA=2483855a8323e27f623bc664afc4b4470787cfdd +ARG ODOO_RELEASE=20210210 +ARG ODOO_SHA=1b428768c8106106f046f337096c1a9cd49e780d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From f8212600f6478a15fac9ff3e7d8a926f78435860 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 17 Feb 2021 08:22:18 +0100 Subject: [PATCH 042/208] [REF] Odoo 12.0-14.0: update to release 20210217 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index b3e67aade..d71fcfc3f 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210210 -ARG ODOO_SHA=5dbafa58ade2b5f6222bb0126bff0c31c61fe7f9 +ARG ODOO_RELEASE=20210217 +ARG ODOO_SHA=1fe634da61ffb3d7292d502e004cdb1c576afee8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 5b9355eda..40bf19875 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210210 -ARG ODOO_SHA=27e67879f5d193ec1af235d8450e46eec79deb5a +ARG ODOO_RELEASE=20210217 +ARG ODOO_SHA=fe66a740ba64e29872b6adfcb424c0574aa43fb5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 97e5c32f3..8f14f3da2 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210210 -ARG ODOO_SHA=1b428768c8106106f046f337096c1a9cd49e780d +ARG ODOO_RELEASE=20210217 +ARG ODOO_SHA=1a117bc676fbd84af93be716fde456c1477bb82d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From ef15321cddf021d9a7559c11a9a3ca85f211a03f Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 26 Feb 2021 13:40:39 +0100 Subject: [PATCH 043/208] [REF] Odoo 12.0-14.0: update to release 20210226 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index d71fcfc3f..129c1fca0 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210217 -ARG ODOO_SHA=1fe634da61ffb3d7292d502e004cdb1c576afee8 +ARG ODOO_RELEASE=20210226 +ARG ODOO_SHA=7d580c67928ca5fbb1beb49221b11c6513f8a6ed RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 40bf19875..cafde2851 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210217 -ARG ODOO_SHA=fe66a740ba64e29872b6adfcb424c0574aa43fb5 +ARG ODOO_RELEASE=20210226 +ARG ODOO_SHA=a3a1561cda391d5ec771e0b228ea50ff31949a0a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 8f14f3da2..09f7956db 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210217 -ARG ODOO_SHA=1a117bc676fbd84af93be716fde456c1477bb82d +ARG ODOO_RELEASE=20210226 +ARG ODOO_SHA=b0b9309d5156ae171d6f0213d3b15005b9257c47 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 99e3de2f03d74d087313edade9620f0912f9212e Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 8 Mar 2021 08:03:56 +0100 Subject: [PATCH 044/208] [REF] Odoo 12.0-14.0: update to release 20210308 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 129c1fca0..26a173b03 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210226 -ARG ODOO_SHA=7d580c67928ca5fbb1beb49221b11c6513f8a6ed +ARG ODOO_RELEASE=20210308 +ARG ODOO_SHA=e77a7a50c71c71722e6a012da2d7aa8b41dee3f3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index cafde2851..e4bb01a0a 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210226 -ARG ODOO_SHA=a3a1561cda391d5ec771e0b228ea50ff31949a0a +ARG ODOO_RELEASE=20210308 +ARG ODOO_SHA=68400af8c3710a16fd94e6c64f99c532abb575ad RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 09f7956db..a09e5df04 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210226 -ARG ODOO_SHA=b0b9309d5156ae171d6f0213d3b15005b9257c47 +ARG ODOO_RELEASE=20210308 +ARG ODOO_SHA=4daeebd19613ae7d0cf53f23c2f47a2b39b29163 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From d76e5a9120e02ab985829e7562ab6227b30819c9 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 18 Mar 2021 09:08:57 +0100 Subject: [PATCH 045/208] [REF] Odoo 12.0-14.0: update to release 20210318 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 26a173b03..ab94986f6 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210308 -ARG ODOO_SHA=e77a7a50c71c71722e6a012da2d7aa8b41dee3f3 +ARG ODOO_RELEASE=20210318 +ARG ODOO_SHA=830878e5deb4133e7bd75360981f397943a7a433 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index e4bb01a0a..305954aff 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210308 -ARG ODOO_SHA=68400af8c3710a16fd94e6c64f99c532abb575ad +ARG ODOO_RELEASE=20210318 +ARG ODOO_SHA=e72e224190d65a9679b764f085b2403fcb6ad97d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index a09e5df04..6088a99cd 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210308 -ARG ODOO_SHA=4daeebd19613ae7d0cf53f23c2f47a2b39b29163 +ARG ODOO_RELEASE=20210318 +ARG ODOO_SHA=c8b020d0a3197f02ed75d8245c8626f9f123edf2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From ece2519a00a5609e73936e436575f5970fb52dc7 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 30 Mar 2021 09:07:59 +0200 Subject: [PATCH 046/208] [REF] Odoo 12.0-14.0: update to release 20210330 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index ab94986f6..94a3ce35d 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210318 -ARG ODOO_SHA=830878e5deb4133e7bd75360981f397943a7a433 +ARG ODOO_RELEASE=20210329 +ARG ODOO_SHA=cd334511a519ec8b8fd3f4555171d17f94107b77 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 305954aff..dd39dff05 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210318 -ARG ODOO_SHA=e72e224190d65a9679b764f085b2403fcb6ad97d +ARG ODOO_RELEASE=20210330 +ARG ODOO_SHA=0e7a35f95285b360d01f6da0e64282519d025f31 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 6088a99cd..2f3578e1e 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210318 -ARG ODOO_SHA=c8b020d0a3197f02ed75d8245c8626f9f123edf2 +ARG ODOO_RELEASE=20210330 +ARG ODOO_SHA=0a0ebf50846a5e5131a6725795c3fc59d511262d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 59b76d6aa31afebd093a8072ff558d87a6c2aa85 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 7 Apr 2021 09:29:40 +0200 Subject: [PATCH 047/208] [REF] Odoo 12.0-14.0: update to release 20210407 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 94a3ce35d..53c394202 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210329 -ARG ODOO_SHA=cd334511a519ec8b8fd3f4555171d17f94107b77 +ARG ODOO_RELEASE=20210407 +ARG ODOO_SHA=c045039b78bf624cafa00b84f5b2b2b1b5fe532e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index dd39dff05..8f6410892 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210330 -ARG ODOO_SHA=0e7a35f95285b360d01f6da0e64282519d025f31 +ARG ODOO_RELEASE=20210407 +ARG ODOO_SHA=ca37f801e71721044351a6457dcdc4091a138771 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 2f3578e1e..2805fdeea 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210330 -ARG ODOO_SHA=0a0ebf50846a5e5131a6725795c3fc59d511262d +ARG ODOO_RELEASE=20210407 +ARG ODOO_SHA=aff621cdd7e1ee2e27769d26356954cc8d143be1 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From dea339fddc16cbeb88f72376350d138fa4d78650 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 19 Apr 2021 11:11:39 +0200 Subject: [PATCH 048/208] [REF] Odoo 12.0-14.0: update to release 20210419 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 53c394202..e189c7717 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210407 -ARG ODOO_SHA=c045039b78bf624cafa00b84f5b2b2b1b5fe532e +ARG ODOO_RELEASE=20210419 +ARG ODOO_SHA=fc2da8b587cdade7a94a51cb251c5cef9ea13fe8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 8f6410892..4cc7b5070 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210407 -ARG ODOO_SHA=ca37f801e71721044351a6457dcdc4091a138771 +ARG ODOO_RELEASE=20210419 +ARG ODOO_SHA=ec2a29adc7fafb5e7d42a984898f20d259cd4c7a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 2805fdeea..576fa4d71 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210407 -ARG ODOO_SHA=aff621cdd7e1ee2e27769d26356954cc8d143be1 +ARG ODOO_RELEASE=20210419 +ARG ODOO_SHA=ae54fd63089d0c4bef5e123fdefed368a76021ab RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From ce4d60e845aa94bd30685df5b6598cbb5f6c8614 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 27 Apr 2021 08:34:20 +0200 Subject: [PATCH 049/208] [REF] Odoo 12.0-14.0: update to release 20210427 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index e189c7717..df0eb160f 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210419 -ARG ODOO_SHA=fc2da8b587cdade7a94a51cb251c5cef9ea13fe8 +ARG ODOO_RELEASE=20210427 +ARG ODOO_SHA=9e00c380b73efce6b164c2a0d7127de65feed2e3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 4cc7b5070..e5019eb7e 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210419 -ARG ODOO_SHA=ec2a29adc7fafb5e7d42a984898f20d259cd4c7a +ARG ODOO_RELEASE=20210427 +ARG ODOO_SHA=57acf994bb3ed666494231138a7318cfa8d30bec RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 576fa4d71..d20747ccc 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210419 -ARG ODOO_SHA=ae54fd63089d0c4bef5e123fdefed368a76021ab +ARG ODOO_RELEASE=20210427 +ARG ODOO_SHA=9d8e8038d5589bc8f4f5f012773dba4deefd3adc RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From c963853d004e7cb517e8229b60fd3e29197fdac9 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 6 May 2021 09:02:42 +0200 Subject: [PATCH 050/208] [REF] Odoo 12.0-14.0: update to release 20210506 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index df0eb160f..e064f1385 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210427 -ARG ODOO_SHA=9e00c380b73efce6b164c2a0d7127de65feed2e3 +ARG ODOO_RELEASE=20210506 +ARG ODOO_SHA=9898d765f0c31031f86c011d2022f5485ad9b7b6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index e5019eb7e..9a51994a8 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210427 -ARG ODOO_SHA=57acf994bb3ed666494231138a7318cfa8d30bec +ARG ODOO_RELEASE=20210506 +ARG ODOO_SHA=3de3d32b1bb5491855f49480d3d4c2985de9ef62 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index d20747ccc..51f3bea9e 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210427 -ARG ODOO_SHA=9d8e8038d5589bc8f4f5f012773dba4deefd3adc +ARG ODOO_RELEASE=20210506 +ARG ODOO_SHA=72d20b873a21d50be6ce363f76b4e78003d93999 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 574de4ccbbe2578e50ee472a3ac31c798dd08ad3 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 18 May 2021 12:05:02 +0200 Subject: [PATCH 051/208] [REF] Odoo 12.0-14.0: update to release 20210518 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index e064f1385..7026be02e 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210506 -ARG ODOO_SHA=9898d765f0c31031f86c011d2022f5485ad9b7b6 +ARG ODOO_RELEASE=20210518 +ARG ODOO_SHA=217c61f8644ef2dbd72c7e050075d407ffee1e3b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 9a51994a8..4b21a7530 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210506 -ARG ODOO_SHA=3de3d32b1bb5491855f49480d3d4c2985de9ef62 +ARG ODOO_RELEASE=20210518 +ARG ODOO_SHA=3f034937d378bdf761a78c1e9723a54cef302dbd RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 51f3bea9e..ab141439c 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210506 -ARG ODOO_SHA=72d20b873a21d50be6ce363f76b4e78003d93999 +ARG ODOO_RELEASE=20210518 +ARG ODOO_SHA=8e479ad5ac2c7374711bf5d7a1991d3d622be562 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 6d95b778cfdd0673e1571f962a4aac70f67a685e Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 25 May 2021 08:42:20 +0200 Subject: [PATCH 052/208] [REF] Odoo 12.0-14.0: update to release 20210525 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 7026be02e..750a0e833 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210518 -ARG ODOO_SHA=217c61f8644ef2dbd72c7e050075d407ffee1e3b +ARG ODOO_RELEASE=20210525 +ARG ODOO_SHA=c08514dbe2c590a2d9f6029a3fe8abb58306e3a6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 4b21a7530..b4ed5396b 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210518 -ARG ODOO_SHA=3f034937d378bdf761a78c1e9723a54cef302dbd +ARG ODOO_RELEASE=20210525 +ARG ODOO_SHA=206c082550b13c745f446e412562d997da6fefc6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index ab141439c..94fbe93cb 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210518 -ARG ODOO_SHA=8e479ad5ac2c7374711bf5d7a1991d3d622be562 +ARG ODOO_RELEASE=20210525 +ARG ODOO_SHA=1d095badf1a6639b0d029a69ac4a43d360280d95 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From aa6f1bb98f9e23746d958fce2158683df904cfce Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 9 Jun 2021 08:09:36 +0200 Subject: [PATCH 053/208] [REF] Odoo 12.0-14.0: update to release 20210609 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 750a0e833..40f0ab833 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210525 -ARG ODOO_SHA=c08514dbe2c590a2d9f6029a3fe8abb58306e3a6 +ARG ODOO_RELEASE=20210609 +ARG ODOO_SHA=877cad69b0c39439523f23f53993a3e49447a814 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index b4ed5396b..11672c447 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210525 -ARG ODOO_SHA=206c082550b13c745f446e412562d997da6fefc6 +ARG ODOO_RELEASE=20210609 +ARG ODOO_SHA=6a697041b52a8330fdab225d2e49c97296224cd8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 94fbe93cb..07dc05a7b 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210525 -ARG ODOO_SHA=1d095badf1a6639b0d029a69ac4a43d360280d95 +ARG ODOO_RELEASE=20210609 +ARG ODOO_SHA=5d0f9f7f49e60e74ec5505a05cfb61f3fb73761c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From ab85af5589fa406ef0b57bd0bffa322efe87b9b4 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 18 Jun 2021 13:11:25 +0200 Subject: [PATCH 054/208] [REF] Odoo 12.0-14.0: update to release 20210618 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 40f0ab833..d4fb8dbda 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210609 -ARG ODOO_SHA=877cad69b0c39439523f23f53993a3e49447a814 +ARG ODOO_RELEASE=20210618 +ARG ODOO_SHA=1d696a2d048cfdf49ba5daa4e1655901ea507bc1 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 11672c447..02b3dbfec 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210609 -ARG ODOO_SHA=6a697041b52a8330fdab225d2e49c97296224cd8 +ARG ODOO_RELEASE=20210618 +ARG ODOO_SHA=772a85f570e240254221fe3ecd977324db81e2bf RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 07dc05a7b..e3dc53fab 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210609 -ARG ODOO_SHA=5d0f9f7f49e60e74ec5505a05cfb61f3fb73761c +ARG ODOO_RELEASE=20210618 +ARG ODOO_SHA=261431b2bcb6d64751560cbd4dd98a9d98863e0c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 31fb0a3b34a346778acaa3f47d17d8abf5aa6b18 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 2 Jul 2021 09:30:56 +0200 Subject: [PATCH 055/208] [REF] Odoo 12.0-14.0: update to release 20210702 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index d4fb8dbda..7f5b3c655 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210618 -ARG ODOO_SHA=1d696a2d048cfdf49ba5daa4e1655901ea507bc1 +ARG ODOO_RELEASE=20210702 +ARG ODOO_SHA=5c07ed019be6158129e974eced0ee26967b8767f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 02b3dbfec..744664684 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210618 -ARG ODOO_SHA=772a85f570e240254221fe3ecd977324db81e2bf +ARG ODOO_RELEASE=20210702 +ARG ODOO_SHA=f135b9d4967ef9221ff6aba58b1c4a3ea8334202 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index e3dc53fab..36dbf8e45 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210618 -ARG ODOO_SHA=261431b2bcb6d64751560cbd4dd98a9d98863e0c +ARG ODOO_RELEASE=20210702 +ARG ODOO_SHA=03c63a0e755fc4895eeefc97ba7a136bc8d8cde9 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 563544203e98e234b52ce19bb3c6357fca6b2c98 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 13 Jul 2021 09:16:27 +0200 Subject: [PATCH 056/208] [REF] Odoo 12.0-14.0: update to release 20210713 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 7f5b3c655..e8669b305 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210702 -ARG ODOO_SHA=5c07ed019be6158129e974eced0ee26967b8767f +ARG ODOO_RELEASE=20210713 +ARG ODOO_SHA=94460bac26be9050ac681868a5881c430e98702e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 744664684..75e76b17a 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210702 -ARG ODOO_SHA=f135b9d4967ef9221ff6aba58b1c4a3ea8334202 +ARG ODOO_RELEASE=20210713 +ARG ODOO_SHA=018e8f79ba6c2b5431eae1a5b49469a5e1b8977e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 36dbf8e45..8f09d3700 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210702 -ARG ODOO_SHA=03c63a0e755fc4895eeefc97ba7a136bc8d8cde9 +ARG ODOO_RELEASE=20210713 +ARG ODOO_SHA=59408eba9273bf60cb34759b17816553bc583303 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 42923bb50cf7d908ec2a0da1c93d24403be713e8 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 20 Jul 2021 11:02:56 +0200 Subject: [PATCH 057/208] [REF] Odoo 12.0-14.0: update to release 20210720 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index e8669b305..4ea7e0438 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210713 -ARG ODOO_SHA=94460bac26be9050ac681868a5881c430e98702e +ARG ODOO_RELEASE=20210720 +ARG ODOO_SHA=a0f73c6f7dc916286fad189bc8f7f1cb814f8004 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 75e76b17a..7c4b8743c 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210713 -ARG ODOO_SHA=018e8f79ba6c2b5431eae1a5b49469a5e1b8977e +ARG ODOO_RELEASE=20210720 +ARG ODOO_SHA=745f9d176fbe0a5f91459b8c89788ffde3bef476 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 8f09d3700..5b22f74b7 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210713 -ARG ODOO_SHA=59408eba9273bf60cb34759b17816553bc583303 +ARG ODOO_RELEASE=20210720 +ARG ODOO_SHA=897a15c05244de02eceac2a930d169f2010971a6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From b07c4f35b401acec2674a5c570f271684d89c5d0 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 28 Jul 2021 10:46:37 +0200 Subject: [PATCH 058/208] [REF] Odoo 12.0-14.0: update to release 20210728 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 4ea7e0438..2a51a495c 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210720 -ARG ODOO_SHA=a0f73c6f7dc916286fad189bc8f7f1cb814f8004 +ARG ODOO_RELEASE=20210728 +ARG ODOO_SHA=b104aa197c922c88dc6db068f7aa2bafe44521e5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 7c4b8743c..49814031f 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210720 -ARG ODOO_SHA=745f9d176fbe0a5f91459b8c89788ffde3bef476 +ARG ODOO_RELEASE=20210728 +ARG ODOO_SHA=3f1be7d8a149a898dcf1a958d49614c5fcf30e0e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 5b22f74b7..8b467c943 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210720 -ARG ODOO_SHA=897a15c05244de02eceac2a930d169f2010971a6 +ARG ODOO_RELEASE=20210728 +ARG ODOO_SHA=9e4ba128935f9fdaca61965472248fedbebf62d3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 27f9e7e8edf45043379b76bba9df8e1cbe2d0e57 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 5 Aug 2021 16:25:35 +0200 Subject: [PATCH 059/208] [REF] Odoo 12.0-14.0: update to release 20210809 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 2a51a495c..f7cfc9656 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210728 -ARG ODOO_SHA=b104aa197c922c88dc6db068f7aa2bafe44521e5 +ARG ODOO_RELEASE=20210809 +ARG ODOO_SHA=7834befe1d22ae1c30bce23e1c10ab83a2963d26 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 49814031f..c2c4b8dd1 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210728 -ARG ODOO_SHA=3f1be7d8a149a898dcf1a958d49614c5fcf30e0e +ARG ODOO_RELEASE=20210809 +ARG ODOO_SHA=dd7613080ed2b919e6d0b0d819b271400f29a9f9 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 8b467c943..f7653bcb8 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210728 -ARG ODOO_SHA=9e4ba128935f9fdaca61965472248fedbebf62d3 +ARG ODOO_RELEASE=20210809 +ARG ODOO_SHA=d9d18498eab946032cacd23d9e8ae69bfbce046b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 233277f7be894217ae9c3e781862804beb180fb7 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 9 Aug 2021 15:51:56 +0200 Subject: [PATCH 060/208] [IMP] Odoo 12.0-13.0: add support for docker secret In order to avoid postgresql password in an environment variable, a PASSWORD_FILE environment may be used instead. This allow the usage of secrets in docker-compose [0] [0](https://github.com/compose-spec/compose-spec/blob/master/spec.md#secrets) --- 12.0/entrypoint.sh | 4 ++++ 13.0/entrypoint.sh | 4 ++++ 14.0/entrypoint.sh | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/12.0/entrypoint.sh b/12.0/entrypoint.sh index 6dd42c414..f802bcb25 100755 --- a/12.0/entrypoint.sh +++ b/12.0/entrypoint.sh @@ -2,6 +2,10 @@ set -e +if [ -v PASSWORD_FILE ]; then + PASSWORD="$(< $PASSWORD_FILE)" +fi + # set the postgres database host, port, user and password according to the environment # and pass them as arguments to the odoo process if not present in the config file : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} diff --git a/13.0/entrypoint.sh b/13.0/entrypoint.sh index 6dd42c414..f802bcb25 100755 --- a/13.0/entrypoint.sh +++ b/13.0/entrypoint.sh @@ -2,6 +2,10 @@ set -e +if [ -v PASSWORD_FILE ]; then + PASSWORD="$(< $PASSWORD_FILE)" +fi + # set the postgres database host, port, user and password according to the environment # and pass them as arguments to the odoo process if not present in the config file : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} diff --git a/14.0/entrypoint.sh b/14.0/entrypoint.sh index 6dd42c414..f802bcb25 100755 --- a/14.0/entrypoint.sh +++ b/14.0/entrypoint.sh @@ -2,6 +2,10 @@ set -e +if [ -v PASSWORD_FILE ]; then + PASSWORD="$(< $PASSWORD_FILE)" +fi + # set the postgres database host, port, user and password according to the environment # and pass them as arguments to the odoo process if not present in the config file : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} From 9534c8c2fd7afed7605d7219358121ec10537bc1 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 3 Sep 2021 15:51:42 +0200 Subject: [PATCH 061/208] [REF] Odoo 12.0-14.0: update to release 20210903 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index f7cfc9656..53d42f498 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210809 -ARG ODOO_SHA=7834befe1d22ae1c30bce23e1c10ab83a2963d26 +ARG ODOO_RELEASE=20210903 +ARG ODOO_SHA=9597721c9b951e32263a051a53d9a6e392eaf81b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index c2c4b8dd1..f7e6f7ce4 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210809 -ARG ODOO_SHA=dd7613080ed2b919e6d0b0d819b271400f29a9f9 +ARG ODOO_RELEASE=20210903 +ARG ODOO_SHA=ad7e373a34fea964e6ea1fbcb65fc3dbc566165f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index f7653bcb8..b4448b001 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210809 -ARG ODOO_SHA=d9d18498eab946032cacd23d9e8ae69bfbce046b +ARG ODOO_RELEASE=20210903 +ARG ODOO_SHA=d16cb5f6759ab873761f1ec651df20a29de606e7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 9b80fd1684c20bbad2b841376bf48ac105b3c5f8 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 13 Sep 2021 11:32:46 +0200 Subject: [PATCH 062/208] [REF] Odoo 12.0-14.0: update to release 20210913 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 53d42f498..cc12e86ca 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210903 -ARG ODOO_SHA=9597721c9b951e32263a051a53d9a6e392eaf81b +ARG ODOO_RELEASE=20210913 +ARG ODOO_SHA=04d2f6d6ebc176cadd51873518966d2781c340b6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index f7e6f7ce4..892333062 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210903 -ARG ODOO_SHA=ad7e373a34fea964e6ea1fbcb65fc3dbc566165f +ARG ODOO_RELEASE=20210913 +ARG ODOO_SHA=2d7fd9bfe044fd7513d82a8ce5c1ee6b08498468 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index b4448b001..f18f9d4bc 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210903 -ARG ODOO_SHA=d16cb5f6759ab873761f1ec651df20a29de606e7 +ARG ODOO_RELEASE=20210913 +ARG ODOO_SHA=fcd89fb35456b365368d6400d33664d996e6be4c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 79c66cd4f346a2de6906a05bfeab3f61d3bb0881 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 21 Sep 2021 11:17:17 +0200 Subject: [PATCH 063/208] [REF] Odoo 12.0-14.0: update to release 20210921 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index cc12e86ca..b80c79ae5 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210913 -ARG ODOO_SHA=04d2f6d6ebc176cadd51873518966d2781c340b6 +ARG ODOO_RELEASE=20210921 +ARG ODOO_SHA=be20135cab2e42ffa3029b5c196868b08a929659 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 892333062..34df26145 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210913 -ARG ODOO_SHA=2d7fd9bfe044fd7513d82a8ce5c1ee6b08498468 +ARG ODOO_RELEASE=20210921 +ARG ODOO_SHA=af7bac90a379d12116f75616fb6bef1e3bc4c733 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index f18f9d4bc..2e4965f9e 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210913 -ARG ODOO_SHA=fcd89fb35456b365368d6400d33664d996e6be4c +ARG ODOO_RELEASE=20210921 +ARG ODOO_SHA=e5d55b36442cf67744d41e89237e4ccbe4de5a32 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 4f79a47adddee4538ab5d89624e3b6b7c600156f Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 6 Oct 2021 10:46:20 +0200 Subject: [PATCH 064/208] [REF] Odoo 12.0-14.0: update to release 20211006 --- 12.0/Dockerfile | 4 ++-- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index b80c79ae5..71a82d8da 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -67,8 +67,8 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source # Install Odoo ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20210921 -ARG ODOO_SHA=be20135cab2e42ffa3029b5c196868b08a929659 +ARG ODOO_RELEASE=20211006 +ARG ODOO_SHA=f32dcd82b04e9a93e17a7d4b3ab471dc20408253 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 34df26145..07420c014 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20210921 -ARG ODOO_SHA=af7bac90a379d12116f75616fb6bef1e3bc4c733 +ARG ODOO_RELEASE=20211006 +ARG ODOO_SHA=b3545e9d1a28c5955c3fc95d5dbe726807ed70f6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 2e4965f9e..149a180cd 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20210921 -ARG ODOO_SHA=e5d55b36442cf67744d41e89237e4ccbe4de5a32 +ARG ODOO_RELEASE=20211006 +ARG ODOO_SHA=468f467ce89e39b9aa735bbc70412000bd99b2c2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 69ab15cc5c682acf12e56ed328c77f97e5d8f9f8 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 7 Oct 2021 09:07:18 +0200 Subject: [PATCH 065/208] [REM] Odoo 12.0: remove deprecated version --- 12.0/Dockerfile | 100 ------------------------------------------ 12.0/entrypoint.sh | 49 --------------------- 12.0/odoo.conf | 37 ---------------- 12.0/wait-for-psql.py | 32 -------------- 4 files changed, 218 deletions(-) delete mode 100644 12.0/Dockerfile delete mode 100755 12.0/entrypoint.sh delete mode 100644 12.0/odoo.conf delete mode 100755 12.0/wait-for-psql.py diff --git a/12.0/Dockerfile b/12.0/Dockerfile deleted file mode 100644 index 71a82d8da..000000000 --- a/12.0/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM debian:stretch-slim -MAINTAINER Odoo S.A. - -SHELL ["/bin/bash", "-xo", "pipefail", "-c"] - -# Generate locale C.UTF-8 for postgres and general locale data -ENV LANG C.UTF-8 - -# Use backports to avoid install some libs with pip -RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list - -# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - dirmngr \ - fonts-noto-cjk \ - gnupg \ - libssl1.0-dev \ - node-less \ - python3-num2words \ - python3-pip \ - python3-phonenumbers \ - python3-pyldap \ - python3-qrcode \ - python3-renderpm \ - python3-setuptools \ - python3-slugify \ - python3-vobject \ - python3-watchdog \ - python3-xlrd \ - python3-xlwt \ - xz-utils \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ - && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ - && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb - -# install latest postgresql-client -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ - && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && apt-get update \ - && apt-get install --no-install-recommends -y postgresql-client \ - && rm -f /etc/apt/sources.list.d/pgdg.list \ - && rm -rf /var/lib/apt/lists/* - -# Install rtlcss (on Debian stretch) -RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \ - && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/nodejs.gpg.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && apt-get update \ - && apt-get install --no-install-recommends -y nodejs \ - && npm install -g rtlcss \ - && rm -rf /var/lib/apt/lists/* - -# Install Odoo -ENV ODOO_VERSION 12.0 -ARG ODOO_RELEASE=20211006 -ARG ODOO_SHA=f32dcd82b04e9a93e17a7d4b3ab471dc20408253 -RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ - && apt-get update \ - && apt-get -y install --no-install-recommends ./odoo.deb \ - && rm -rf /var/lib/apt/lists/* odoo.deb - -# Copy entrypoint script and Odoo configuration file -COPY ./entrypoint.sh / -COPY ./odoo.conf /etc/odoo/ - -# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons -RUN chown odoo /etc/odoo/odoo.conf \ - && mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons -VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] - -# Expose Odoo services -EXPOSE 8069 8071 8072 - -# Set the default config file -ENV ODOO_RC /etc/odoo/odoo.conf - -COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py - -# Set default user when running the container -USER odoo - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["odoo"] diff --git a/12.0/entrypoint.sh b/12.0/entrypoint.sh deleted file mode 100755 index f802bcb25..000000000 --- a/12.0/entrypoint.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -set -e - -if [ -v PASSWORD_FILE ]; then - PASSWORD="$(< $PASSWORD_FILE)" -fi - -# set the postgres database host, port, user and password according to the environment -# and pass them as arguments to the odoo process if not present in the config file -: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} -: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} -: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} - -DB_ARGS=() -function check_config() { - param="$1" - value="$2" - if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then - value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') - fi; - DB_ARGS+=("--${param}") - DB_ARGS+=("${value}") -} -check_config "db_host" "$HOST" -check_config "db_port" "$PORT" -check_config "db_user" "$USER" -check_config "db_password" "$PASSWORD" - -case "$1" in - -- | odoo) - shift - if [[ "$1" == "scaffold" ]] ; then - exec odoo "$@" - else - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - fi - ;; - -*) - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - ;; - *) - exec "$@" -esac - -exit 1 diff --git a/12.0/odoo.conf b/12.0/odoo.conf deleted file mode 100644 index 28f70c105..000000000 --- a/12.0/odoo.conf +++ /dev/null @@ -1,37 +0,0 @@ -[options] -addons_path = /mnt/extra-addons -data_dir = /var/lib/odoo -; admin_passwd = admin -; csv_internal_sep = , -; db_maxconn = 64 -; db_name = False -; db_template = template1 -; dbfilter = .* -; debug_mode = False -; email_from = False -; limit_memory_hard = 2684354560 -; limit_memory_soft = 2147483648 -; limit_request = 8192 -; limit_time_cpu = 60 -; limit_time_real = 120 -; list_db = True -; log_db = False -; log_handler = [':INFO'] -; log_level = info -; logfile = None -; longpolling_port = 8072 -; max_cron_threads = 2 -; osv_memory_age_limit = 1.0 -; osv_memory_count_limit = False -; smtp_password = False -; smtp_port = 25 -; smtp_server = localhost -; smtp_ssl = False -; smtp_user = False -; workers = 0 -; xmlrpc = True -; xmlrpc_interface = -; xmlrpc_port = 8069 -; xmlrpcs = True -; xmlrpcs_interface = -; xmlrpcs_port = 8071 diff --git a/12.0/wait-for-psql.py b/12.0/wait-for-psql.py deleted file mode 100755 index a55f44098..000000000 --- a/12.0/wait-for-psql.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import psycopg2 -import sys -import time - - -if __name__ == '__main__': - arg_parser = argparse.ArgumentParser() - arg_parser.add_argument('--db_host', required=True) - arg_parser.add_argument('--db_port', required=True) - arg_parser.add_argument('--db_user', required=True) - arg_parser.add_argument('--db_password', required=True) - arg_parser.add_argument('--timeout', type=int, default=5) - - args = arg_parser.parse_args() - - start_time = time.time() - while (time.time() - start_time) < args.timeout: - try: - conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') - error = '' - break - except psycopg2.OperationalError as e: - error = e - else: - conn.close() - time.sleep(1) - - if error: - print("Database connection failure: %s" % error, file=sys.stderr) - sys.exit(1) From 03840f1cf91518147e08359a012f0012349debd8 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 7 Oct 2021 13:36:29 +0200 Subject: [PATCH 066/208] [REF] Odoo 13.0-14.0: bump to release 20211007 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 07420c014..8a2533b5b 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20211006 -ARG ODOO_SHA=b3545e9d1a28c5955c3fc95d5dbe726807ed70f6 +ARG ODOO_RELEASE=20211007 +ARG ODOO_SHA=5761202ca3dea1f89ad2e67a0f4111c5291f20e3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 149a180cd..3a2186f5c 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20211006 -ARG ODOO_SHA=468f467ce89e39b9aa735bbc70412000bd99b2c2 +ARG ODOO_RELEASE=20211007 +ARG ODOO_SHA=183bc4f2d640b53d5e2fb8fc06a1915a432c9ac7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From e6d26592e68f0cdad2e391441255761b3638144c Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 7 Oct 2021 15:52:56 +0200 Subject: [PATCH 067/208] [ADD] Odoo: 15.0 A temporary fix was added to install gsfonts and python3-openssl. They will be removed once the Odoo deb package is fixed and merged. --- 15.0/Dockerfile | 92 +++++++++++++++++++++++++++++++++++++++++++ 15.0/entrypoint.sh | 49 +++++++++++++++++++++++ 15.0/odoo.conf | 37 +++++++++++++++++ 15.0/wait-for-psql.py | 32 +++++++++++++++ 4 files changed, 210 insertions(+) create mode 100644 15.0/Dockerfile create mode 100755 15.0/entrypoint.sh create mode 100644 15.0/odoo.conf create mode 100755 15.0/wait-for-psql.py diff --git a/15.0/Dockerfile b/15.0/Dockerfile new file mode 100644 index 000000000..6cff9a8ec --- /dev/null +++ b/15.0/Dockerfile @@ -0,0 +1,92 @@ +FROM debian:bullseye-slim +MAINTAINER Odoo S.A. + +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + +# Generate locale C.UTF-8 for postgres and general locale data +ENV LANG C.UTF-8 + +# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + dirmngr \ + fonts-noto-cjk \ + gnupg \ + # TO REEMOVE WHEN PACKAGED + gsfonts \ + libssl-dev \ + node-less \ + npm \ + python3-num2words \ + python3-pdfminer \ + python3-pip \ + python3-phonenumbers \ + python3-pyldap \ + # TO REMOVE WHEN PACKAGED + python3-openssl \ + python3-qrcode \ + python3-renderpm \ + python3-setuptools \ + python3-slugify \ + python3-vobject \ + python3-watchdog \ + python3-xlrd \ + python3-xlwt \ + xz-utils \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ + && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb + +# install latest postgresql-client +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ + && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ + && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ + && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && apt-get update \ + && apt-get install --no-install-recommends -y postgresql-client \ + && rm -f /etc/apt/sources.list.d/pgdg.list \ + && rm -rf /var/lib/apt/lists/* + +# Install rtlcss (on Debian buster) +RUN npm install -g rtlcss + +# Install Odoo +ENV ODOO_VERSION 15.0 +ARG ODOO_RELEASE=20211007 +ARG ODOO_SHA=aee026f813f334400aa49dc857d4043719f8f395 +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ + && apt-get update \ + && apt-get -y install --no-install-recommends ./odoo.deb \ + && rm -rf /var/lib/apt/lists/* odoo.deb + +# Copy entrypoint script and Odoo configuration file +COPY ./entrypoint.sh / +COPY ./odoo.conf /etc/odoo/ + +# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons +RUN chown odoo /etc/odoo/odoo.conf \ + && mkdir -p /mnt/extra-addons \ + && chown -R odoo /mnt/extra-addons +VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] + +# Expose Odoo services +EXPOSE 8069 8071 8072 + +# Set the default config file +ENV ODOO_RC /etc/odoo/odoo.conf + +COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py + +# Set default user when running the container +USER odoo + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["odoo"] diff --git a/15.0/entrypoint.sh b/15.0/entrypoint.sh new file mode 100755 index 000000000..f802bcb25 --- /dev/null +++ b/15.0/entrypoint.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +set -e + +if [ -v PASSWORD_FILE ]; then + PASSWORD="$(< $PASSWORD_FILE)" +fi + +# set the postgres database host, port, user and password according to the environment +# and pass them as arguments to the odoo process if not present in the config file +: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} + +DB_ARGS=() +function check_config() { + param="$1" + value="$2" + if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then + value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') + fi; + DB_ARGS+=("--${param}") + DB_ARGS+=("${value}") +} +check_config "db_host" "$HOST" +check_config "db_port" "$PORT" +check_config "db_user" "$USER" +check_config "db_password" "$PASSWORD" + +case "$1" in + -- | odoo) + shift + if [[ "$1" == "scaffold" ]] ; then + exec odoo "$@" + else + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + fi + ;; + -*) + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + ;; + *) + exec "$@" +esac + +exit 1 diff --git a/15.0/odoo.conf b/15.0/odoo.conf new file mode 100644 index 000000000..28f70c105 --- /dev/null +++ b/15.0/odoo.conf @@ -0,0 +1,37 @@ +[options] +addons_path = /mnt/extra-addons +data_dir = /var/lib/odoo +; admin_passwd = admin +; csv_internal_sep = , +; db_maxconn = 64 +; db_name = False +; db_template = template1 +; dbfilter = .* +; debug_mode = False +; email_from = False +; limit_memory_hard = 2684354560 +; limit_memory_soft = 2147483648 +; limit_request = 8192 +; limit_time_cpu = 60 +; limit_time_real = 120 +; list_db = True +; log_db = False +; log_handler = [':INFO'] +; log_level = info +; logfile = None +; longpolling_port = 8072 +; max_cron_threads = 2 +; osv_memory_age_limit = 1.0 +; osv_memory_count_limit = False +; smtp_password = False +; smtp_port = 25 +; smtp_server = localhost +; smtp_ssl = False +; smtp_user = False +; workers = 0 +; xmlrpc = True +; xmlrpc_interface = +; xmlrpc_port = 8069 +; xmlrpcs = True +; xmlrpcs_interface = +; xmlrpcs_port = 8071 diff --git a/15.0/wait-for-psql.py b/15.0/wait-for-psql.py new file mode 100755 index 000000000..a55f44098 --- /dev/null +++ b/15.0/wait-for-psql.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 +import argparse +import psycopg2 +import sys +import time + + +if __name__ == '__main__': + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument('--db_host', required=True) + arg_parser.add_argument('--db_port', required=True) + arg_parser.add_argument('--db_user', required=True) + arg_parser.add_argument('--db_password', required=True) + arg_parser.add_argument('--timeout', type=int, default=5) + + args = arg_parser.parse_args() + + start_time = time.time() + while (time.time() - start_time) < args.timeout: + try: + conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') + error = '' + break + except psycopg2.OperationalError as e: + error = e + else: + conn.close() + time.sleep(1) + + if error: + print("Database connection failure: %s" % error, file=sys.stderr) + sys.exit(1) From bb44f3916c974b7586fc278b0664c63e7d989134 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 18 Oct 2021 09:34:31 +0200 Subject: [PATCH 068/208] [REF] Odoo 13.0-15.0: update to release 20211018 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 8a2533b5b..4b8cf71d3 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20211007 -ARG ODOO_SHA=5761202ca3dea1f89ad2e67a0f4111c5291f20e3 +ARG ODOO_RELEASE=20211018 +ARG ODOO_SHA=39e7ddbb8ef0a011176b4037a572f2dd5c51ef55 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 3a2186f5c..c5446cfec 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20211007 -ARG ODOO_SHA=183bc4f2d640b53d5e2fb8fc06a1915a432c9ac7 +ARG ODOO_RELEASE=20211018 +ARG ODOO_SHA=8b3ecd81fd78b3ff0d93457b005bb4c98a5680b4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 6cff9a8ec..f746a837d 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -59,8 +59,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20211007 -ARG ODOO_SHA=aee026f813f334400aa49dc857d4043719f8f395 +ARG ODOO_RELEASE=20211018 +ARG ODOO_SHA=41ddb9e8ea942595786c000f87fc1e045470b2b7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From dc50f63c24a9274ac43852f9dafdddc8efa41bc5 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 29 Oct 2021 13:50:43 +0200 Subject: [PATCH 069/208] [FIX] Odoo 15.0: remove temporary fix --- 15.0/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index f746a837d..aba8115f2 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -14,8 +14,6 @@ RUN apt-get update && \ dirmngr \ fonts-noto-cjk \ gnupg \ - # TO REEMOVE WHEN PACKAGED - gsfonts \ libssl-dev \ node-less \ npm \ @@ -24,8 +22,6 @@ RUN apt-get update && \ python3-pip \ python3-phonenumbers \ python3-pyldap \ - # TO REMOVE WHEN PACKAGED - python3-openssl \ python3-qrcode \ python3-renderpm \ python3-setuptools \ From fb468f57e06ce2bd1111c0cdca34fc96087bb0b5 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 29 Oct 2021 14:40:36 +0200 Subject: [PATCH 070/208] [REF] Odoo 13.0-15.0: update to release 20211029 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 4b8cf71d3..6585b588c 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20211018 -ARG ODOO_SHA=39e7ddbb8ef0a011176b4037a572f2dd5c51ef55 +ARG ODOO_RELEASE=20211029 +ARG ODOO_SHA=0fb155addb2544456788eafa3d2681a8db028c2c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index c5446cfec..af698334c 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20211018 -ARG ODOO_SHA=8b3ecd81fd78b3ff0d93457b005bb4c98a5680b4 +ARG ODOO_RELEASE=20211029 +ARG ODOO_SHA=9b1b93782b939f6246f3e230c655d68caff449d2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index aba8115f2..bfbd04b2f 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20211018 -ARG ODOO_SHA=41ddb9e8ea942595786c000f87fc1e045470b2b7 +ARG ODOO_RELEASE=20211029 +ARG ODOO_SHA=1b0d6aac881aa968a77e57f529d357688786a12c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 9c3d1ccd190e24c8346c0feb00c78afb6e9e5118 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 10 Nov 2021 16:56:06 +0100 Subject: [PATCH 071/208] [REF] Odoo 13.0-15.0: update to release 20211110 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 6585b588c..4f8c2723b 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20211029 -ARG ODOO_SHA=0fb155addb2544456788eafa3d2681a8db028c2c +ARG ODOO_RELEASE=20211110 +ARG ODOO_SHA=c4ae69b33bd4353f6023bb57419133de389e0849 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index af698334c..0e3e5e42d 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20211029 -ARG ODOO_SHA=9b1b93782b939f6246f3e230c655d68caff449d2 +ARG ODOO_RELEASE=20211110 +ARG ODOO_SHA=95a45d67d38de6d81399533b8b4e39fca08c1254 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index bfbd04b2f..dff71826c 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20211029 -ARG ODOO_SHA=1b0d6aac881aa968a77e57f529d357688786a12c +ARG ODOO_RELEASE=20211110 +ARG ODOO_SHA=313cb2c38f939374f524aaebb017ef0e1724e375 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From c51eacfe2a5f8f322ce04ed85bed4848f4194432 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 19 Nov 2021 09:34:25 +0100 Subject: [PATCH 072/208] [REF] Odoo 13.0-15.0: update to release 20211119 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 4f8c2723b..f6e23457f 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20211110 -ARG ODOO_SHA=c4ae69b33bd4353f6023bb57419133de389e0849 +ARG ODOO_RELEASE=20211119 +ARG ODOO_SHA=7081390e60485a6caa1ded5d6a092a25ff851888 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 0e3e5e42d..2a21d404c 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20211110 -ARG ODOO_SHA=95a45d67d38de6d81399533b8b4e39fca08c1254 +ARG ODOO_RELEASE=20211119 +ARG ODOO_SHA=815580db210a2250b1c2b4f80a22c279892030d9 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index dff71826c..2ab1010d3 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20211110 -ARG ODOO_SHA=313cb2c38f939374f524aaebb017ef0e1724e375 +ARG ODOO_RELEASE=20211119 +ARG ODOO_SHA=19307c2187ec410e8fd945eac94893c8d245084f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From e5654cfab340b6007957a89895d84ce2fe434827 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 1 Dec 2021 15:48:13 +0100 Subject: [PATCH 073/208] [REF] Odoo 13.0-15.0: update to release 20211201 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index f6e23457f..b8a24b311 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20211119 -ARG ODOO_SHA=7081390e60485a6caa1ded5d6a092a25ff851888 +ARG ODOO_RELEASE=20211201 +ARG ODOO_SHA=c16094e8ea981346e6de1171ddec9541905b254f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 2a21d404c..735adab5d 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20211119 -ARG ODOO_SHA=815580db210a2250b1c2b4f80a22c279892030d9 +ARG ODOO_RELEASE=20211201 +ARG ODOO_SHA=01d16e4ce92fd341438f1a95984b505c9d62cc14 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 2ab1010d3..8d9b2e858 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20211119 -ARG ODOO_SHA=19307c2187ec410e8fd945eac94893c8d245084f +ARG ODOO_RELEASE=20211201 +ARG ODOO_SHA=8ab8486e502eb7b092ff2fc87037bd0e7a740f52 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From c9691f91bebeececc3d81d47edb45af2f35bae16 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 13 Dec 2021 11:14:52 +0100 Subject: [PATCH 074/208] [REF] Odoo 13.0-15.0: update to release 20211213 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index b8a24b311..33f9e9107 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20211201 -ARG ODOO_SHA=c16094e8ea981346e6de1171ddec9541905b254f +ARG ODOO_RELEASE=20211213 +ARG ODOO_SHA=acbb9ee40e8998751d9eb632444c1fc1e105766d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 735adab5d..a499af8f2 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20211201 -ARG ODOO_SHA=01d16e4ce92fd341438f1a95984b505c9d62cc14 +ARG ODOO_RELEASE=20211213 +ARG ODOO_SHA=fbd8ce32d2949e11f83453759c5f41ba89ed8f2c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 8d9b2e858..809977c40 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20211201 -ARG ODOO_SHA=8ab8486e502eb7b092ff2fc87037bd0e7a740f52 +ARG ODOO_RELEASE=20211213 +ARG ODOO_SHA=b95ff701609710b8d11a63a7feca2129c01193c0 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 301937f44c563fadc492933f078676c2aa64bd56 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 20 Dec 2021 10:51:02 +0100 Subject: [PATCH 075/208] [REF] Odoo 13.0-15.0: update to release 20211220 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 33f9e9107..46b6b2de4 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20211213 -ARG ODOO_SHA=acbb9ee40e8998751d9eb632444c1fc1e105766d +ARG ODOO_RELEASE=20211220 +ARG ODOO_SHA=02d48b2c7cf5de7e7239d6c7c1fc8456ed3ccdd6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index a499af8f2..a4701bf1a 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20211213 -ARG ODOO_SHA=fbd8ce32d2949e11f83453759c5f41ba89ed8f2c +ARG ODOO_RELEASE=20211220 +ARG ODOO_SHA=e97fa0f040b4c7b2529a7ab0a79b8926b575db46 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 809977c40..87b8ff9c8 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20211213 -ARG ODOO_SHA=b95ff701609710b8d11a63a7feca2129c01193c0 +ARG ODOO_RELEASE=20211220 +ARG ODOO_SHA=40b41702d22857f29ef3e87056dd826e47c8feb0 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 51548ef50fd9a0b2347f5fbd533ff9a84af4e084 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 29 Dec 2021 11:50:47 +0100 Subject: [PATCH 076/208] [REF] Odoo 13.0-15.0: update to release 20211229 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 46b6b2de4..22f54e83e 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20211220 -ARG ODOO_SHA=02d48b2c7cf5de7e7239d6c7c1fc8456ed3ccdd6 +ARG ODOO_RELEASE=20211229 +ARG ODOO_SHA=7824405bb0f2752a9f7f73a07661b1fcd3d09c69 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index a4701bf1a..0edffb550 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20211220 -ARG ODOO_SHA=e97fa0f040b4c7b2529a7ab0a79b8926b575db46 +ARG ODOO_RELEASE=20211229 +ARG ODOO_SHA=8ab90c81faec34d60db5cff7a4f47276b6659a0f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 87b8ff9c8..57177afae 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20211220 -ARG ODOO_SHA=40b41702d22857f29ef3e87056dd826e47c8feb0 +ARG ODOO_RELEASE=20211229 +ARG ODOO_SHA=9cb4888027bb55afc7dab2cef2d5ffb4f6ebce12 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 9c6f67fcc51a29b496f3a44231aaf3c1b7773b60 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 10 Jan 2022 16:55:32 +0100 Subject: [PATCH 077/208] [REF] Odoo 13.0-15.0: update to release 20220110 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 22f54e83e..c2d0e8a5c 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20211229 -ARG ODOO_SHA=7824405bb0f2752a9f7f73a07661b1fcd3d09c69 +ARG ODOO_RELEASE=20220110 +ARG ODOO_SHA=d7b3daafb97d47551e0754a874e3c39adbb39ae3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 0edffb550..f16e2c38d 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20211229 -ARG ODOO_SHA=8ab90c81faec34d60db5cff7a4f47276b6659a0f +ARG ODOO_RELEASE=20220110 +ARG ODOO_SHA=a32b3d766e45320a0092b40b18728b326da1210c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 57177afae..bc3040844 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20211229 -ARG ODOO_SHA=9cb4888027bb55afc7dab2cef2d5ffb4f6ebce12 +ARG ODOO_RELEASE=20220110 +ARG ODOO_SHA=7a4c94d79da0b05894effbaff06ca2b7250f0569 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 7d0956a5dae2215566a3c1caad97956924745a11 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 26 Jan 2022 12:04:19 +0100 Subject: [PATCH 078/208] [REF] Odoo 13.0-15.0: update to release 20220126 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index c2d0e8a5c..449833838 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220110 -ARG ODOO_SHA=d7b3daafb97d47551e0754a874e3c39adbb39ae3 +ARG ODOO_RELEASE=20220126 +ARG ODOO_SHA=b9ab34152fff8027ed2622cbbdc7b3387b2ab270 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index f16e2c38d..93612fe40 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220110 -ARG ODOO_SHA=a32b3d766e45320a0092b40b18728b326da1210c +ARG ODOO_RELEASE=20220126 +ARG ODOO_SHA=44e94c2e87735991d7adffa07067a6b46dd25c1f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index bc3040844..5c1d397c5 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220110 -ARG ODOO_SHA=7a4c94d79da0b05894effbaff06ca2b7250f0569 +ARG ODOO_RELEASE=20220126 +ARG ODOO_SHA=06fd2afdaa200f8a59a8e9682fcdba1f8f525ca7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 3a872aba1513b586999db54cb403d02a14aede32 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 4 Feb 2022 17:05:00 +0100 Subject: [PATCH 079/208] [REF] Odoo 13.0-15.0: update to release 20220204 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 449833838..f13f14a37 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220126 -ARG ODOO_SHA=b9ab34152fff8027ed2622cbbdc7b3387b2ab270 +ARG ODOO_RELEASE=20220204 +ARG ODOO_SHA=bc23629b326a00db91e31a8a6735946519b78dd7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 93612fe40..c6d8316e9 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220126 -ARG ODOO_SHA=44e94c2e87735991d7adffa07067a6b46dd25c1f +ARG ODOO_RELEASE=20220204 +ARG ODOO_SHA=8af8029ab9176ac00776c7aa464af691dfa10547 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 5c1d397c5..80010dc17 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220126 -ARG ODOO_SHA=06fd2afdaa200f8a59a8e9682fcdba1f8f525ca7 +ARG ODOO_RELEASE=20220204 +ARG ODOO_SHA=6f7f4163fb5c73a24df365ca392fad120c9973df RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From a88f54774e82c3c9a96474f5ae8ddc1153a690e5 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 17 Feb 2022 09:56:11 +0100 Subject: [PATCH 080/208] [REF] Odoo 13.0-15.0: update to release 20220217 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index f13f14a37..5ba320a31 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220204 -ARG ODOO_SHA=bc23629b326a00db91e31a8a6735946519b78dd7 +ARG ODOO_RELEASE=20220217 +ARG ODOO_SHA=37c5e4abedbad70199f9588225a9c35f2d960d13 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index c6d8316e9..40a827fcb 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220204 -ARG ODOO_SHA=8af8029ab9176ac00776c7aa464af691dfa10547 +ARG ODOO_RELEASE=20220217 +ARG ODOO_SHA=b7a4ab618dc5144ebf02ff91d8c151dca30080d7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 80010dc17..dca609464 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220204 -ARG ODOO_SHA=6f7f4163fb5c73a24df365ca392fad120c9973df +ARG ODOO_RELEASE=20220217 +ARG ODOO_SHA=1cd3850c04e63652b2c66b73d8e8d7e013777e2f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From f0cd6329a437a38351bce403edc01ebbf08e8aee Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 25 Feb 2022 10:14:56 +0100 Subject: [PATCH 081/208] [REF] Odoo 13.0-15.0: update to release 20220225 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 5ba320a31..cf336baf2 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220217 -ARG ODOO_SHA=37c5e4abedbad70199f9588225a9c35f2d960d13 +ARG ODOO_RELEASE=20220225 +ARG ODOO_SHA=185dd6dd73213fac8fd042d6c408bd26f697d53e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 40a827fcb..3f8b67372 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220217 -ARG ODOO_SHA=b7a4ab618dc5144ebf02ff91d8c151dca30080d7 +ARG ODOO_RELEASE=20220225 +ARG ODOO_SHA=43391a3049b84ee35d58815ad1052c777a113e60 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index dca609464..b17b768a8 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220217 -ARG ODOO_SHA=1cd3850c04e63652b2c66b73d8e8d7e013777e2f +ARG ODOO_RELEASE=20220225 +ARG ODOO_SHA=81a0f480b3f9835000cba40e99bf874d9462effe RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 912599984d8613373c649a827d82b05fc69bbe22 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 7 Mar 2022 16:43:01 +0100 Subject: [PATCH 082/208] [REF] Odoo 13.0-15.0: update to release 20220307 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index cf336baf2..6c45b73ec 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220225 -ARG ODOO_SHA=185dd6dd73213fac8fd042d6c408bd26f697d53e +ARG ODOO_RELEASE=20220307 +ARG ODOO_SHA=63fac7c528d28de8df554f15c0a99a9efaa63ff5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 3f8b67372..f3a2e4296 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220225 -ARG ODOO_SHA=43391a3049b84ee35d58815ad1052c777a113e60 +ARG ODOO_RELEASE=20220307 +ARG ODOO_SHA=4260081fc3a7712e6e2627289673ac586adedbd7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index b17b768a8..da0841824 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220225 -ARG ODOO_SHA=81a0f480b3f9835000cba40e99bf874d9462effe +ARG ODOO_RELEASE=20220307 +ARG ODOO_SHA=460e9c91ac6d5d8a9c22dffae95247cd8ed61d55 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 3b93ef1d1becfcd6e56e10ee82a15446e932390b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 17 Mar 2022 13:06:55 +0100 Subject: [PATCH 083/208] [REF] Odoo 13.0-15.0: update to release 20220317 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 6c45b73ec..9f7dad330 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220307 -ARG ODOO_SHA=63fac7c528d28de8df554f15c0a99a9efaa63ff5 +ARG ODOO_RELEASE=20220317 +ARG ODOO_SHA=2dc6ad8b50d9f3b9ec3b7b5e24d66e1f9cc57bfd RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index f3a2e4296..10d5d190c 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220307 -ARG ODOO_SHA=4260081fc3a7712e6e2627289673ac586adedbd7 +ARG ODOO_RELEASE=20220317 +ARG ODOO_SHA=7afef5494a9b74a63d30532aa9b86dcf8268e8c1 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index da0841824..62230d9ce 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220307 -ARG ODOO_SHA=460e9c91ac6d5d8a9c22dffae95247cd8ed61d55 +ARG ODOO_RELEASE=20220317 +ARG ODOO_SHA=8b4480787cd1016c5e083210401b37c87c67863d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 9913d13c50beaed8b5ee349578f2641f3507bccd Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 25 Mar 2022 09:53:47 +0100 Subject: [PATCH 084/208] [REF] Odoo 13.0-15.0: update to release 20220325 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 9f7dad330..5fd0105e5 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220317 -ARG ODOO_SHA=2dc6ad8b50d9f3b9ec3b7b5e24d66e1f9cc57bfd +ARG ODOO_RELEASE=20220325 +ARG ODOO_SHA=93b53403ec8f09103d6c2cb70dc4901756bc58d2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 10d5d190c..9ff33803c 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220317 -ARG ODOO_SHA=7afef5494a9b74a63d30532aa9b86dcf8268e8c1 +ARG ODOO_RELEASE=20220325 +ARG ODOO_SHA=eabfcf757b772782f11db1ea484e9319be58c3c5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 62230d9ce..5c437baeb 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220317 -ARG ODOO_SHA=8b4480787cd1016c5e083210401b37c87c67863d +ARG ODOO_RELEASE=20220325 +ARG ODOO_SHA=3d498c38022150b5e3907f2d72346cefe3e16809 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From f2933c515831713d96614add0d0c5fd073a6153f Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 1 Apr 2022 10:01:46 +0200 Subject: [PATCH 085/208] [REF] Odoo 13.0-15.0: update to release 20220401 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 5fd0105e5..8ab6849cb 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220325 -ARG ODOO_SHA=93b53403ec8f09103d6c2cb70dc4901756bc58d2 +ARG ODOO_RELEASE=20220401 +ARG ODOO_SHA=2af3333f6048663e921ea49d7dc836d4dcf31cb4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 9ff33803c..de7209c58 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220325 -ARG ODOO_SHA=eabfcf757b772782f11db1ea484e9319be58c3c5 +ARG ODOO_RELEASE=20220401 +ARG ODOO_SHA=43eabf4f6f55cd2887dc123d955bfaf9c7f27a32 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 5c437baeb..59a2fc710 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220325 -ARG ODOO_SHA=3d498c38022150b5e3907f2d72346cefe3e16809 +ARG ODOO_RELEASE=20220401 +ARG ODOO_SHA=47f9d71dcfd0c0884969b361bc1bbe5f45fb3ac5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 1649d6cc0e474a19c1169439c334bd3507fd71cc Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 25 Apr 2022 15:12:11 +0200 Subject: [PATCH 086/208] [REF] Odoo 13.0-15.0: update to release 20220425 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 8ab6849cb..4fd79d81b 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220401 -ARG ODOO_SHA=2af3333f6048663e921ea49d7dc836d4dcf31cb4 +ARG ODOO_RELEASE=20220425 +ARG ODOO_SHA=3409fcd9d0365e96357ab6fa87d6553f980eb0f5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index de7209c58..bccdcf6d2 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220401 -ARG ODOO_SHA=43eabf4f6f55cd2887dc123d955bfaf9c7f27a32 +ARG ODOO_RELEASE=20220425 +ARG ODOO_SHA=f291bdf86a35821b96fa6565756585f8d5b353c4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 59a2fc710..7215a1f9b 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220401 -ARG ODOO_SHA=47f9d71dcfd0c0884969b361bc1bbe5f45fb3ac5 +ARG ODOO_RELEASE=20220425 +ARG ODOO_SHA=20dcece1bc2e25cf3950a419074b127dd7ef8c0f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 9264df22a694b66cc3b866f92d180e3b084a015e Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 6 May 2022 15:49:45 +0200 Subject: [PATCH 087/208] [REF] Odoo 13.0-15.0: update to release 20220506 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 4fd79d81b..9711a151f 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220425 -ARG ODOO_SHA=3409fcd9d0365e96357ab6fa87d6553f980eb0f5 +ARG ODOO_RELEASE=20220506 +ARG ODOO_SHA=3dcd6300b65a9f644a4dfc20989ae94b4a1f0b75 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index bccdcf6d2..6fe39d5fa 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220425 -ARG ODOO_SHA=f291bdf86a35821b96fa6565756585f8d5b353c4 +ARG ODOO_RELEASE=20220506 +ARG ODOO_SHA=ac816b4769fe14b9a7894790fcf7d98bcb6c3741 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 7215a1f9b..a05dd39f2 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220425 -ARG ODOO_SHA=20dcece1bc2e25cf3950a419074b127dd7ef8c0f +ARG ODOO_RELEASE=20220506 +ARG ODOO_SHA=5c6b3e4f33d03472e6ee668b340984b7661de14a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 545e19bca196adead368bc895ebd2860dbc4cd9a Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 20 May 2022 13:09:06 +0200 Subject: [PATCH 088/208] [REF] Odoo 13.0-15.0: update to release 20220520 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 9711a151f..13eee5889 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220506 -ARG ODOO_SHA=3dcd6300b65a9f644a4dfc20989ae94b4a1f0b75 +ARG ODOO_RELEASE=20220520 +ARG ODOO_SHA=33fd70bdad094c91ccf445753be2043c9b059b33 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 6fe39d5fa..26f4b8cb2 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220506 -ARG ODOO_SHA=ac816b4769fe14b9a7894790fcf7d98bcb6c3741 +ARG ODOO_RELEASE=20220520 +ARG ODOO_SHA=f666f4a72c7ace2fa13eea01970012011c7d4828 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index a05dd39f2..725e700a7 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220506 -ARG ODOO_SHA=5c6b3e4f33d03472e6ee668b340984b7661de14a +ARG ODOO_RELEASE=20220520 +ARG ODOO_SHA=0663b11f4c05c66aadfe74fbd27b14beaa9e0f07 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 4184e82736e681bfc37021d2a0412714355b40dd Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 31 May 2022 11:20:01 +0200 Subject: [PATCH 089/208] [REF] Odoo 13.0-15.0: update to release 20220531 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 13eee5889..1fa2669dc 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220520 -ARG ODOO_SHA=33fd70bdad094c91ccf445753be2043c9b059b33 +ARG ODOO_RELEASE=20220531 +ARG ODOO_SHA=d3d7e789c2abd43ff5548d7e1ff879393b5689f3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 26f4b8cb2..ef6c24568 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220520 -ARG ODOO_SHA=f666f4a72c7ace2fa13eea01970012011c7d4828 +ARG ODOO_RELEASE=20220531 +ARG ODOO_SHA=fdf78d37dd9b41a737a6314c8997863b4e5be3a2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 725e700a7..edebc9715 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220520 -ARG ODOO_SHA=0663b11f4c05c66aadfe74fbd27b14beaa9e0f07 +ARG ODOO_RELEASE=20220531 +ARG ODOO_SHA=a7011fdc43d565203812612ba28e601d7038ba0b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 8358407bd99d7dbfdbb37fc0bb111ef36c9c5469 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 9 Jun 2022 09:18:13 +0200 Subject: [PATCH 090/208] [REF] Odoo 13.0-15.0: update to release 20220609 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 1fa2669dc..09eeef420 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220531 -ARG ODOO_SHA=d3d7e789c2abd43ff5548d7e1ff879393b5689f3 +ARG ODOO_RELEASE=20220609 +ARG ODOO_SHA=bda7f94b0e8fb8bad3ff46db1ea1ca6928757533 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index ef6c24568..161334b07 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220531 -ARG ODOO_SHA=fdf78d37dd9b41a737a6314c8997863b4e5be3a2 +ARG ODOO_RELEASE=20220609 +ARG ODOO_SHA=9587d138e05cac1d41cfb467adc6c034e842ca55 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index edebc9715..37a5a5523 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220531 -ARG ODOO_SHA=a7011fdc43d565203812612ba28e601d7038ba0b +ARG ODOO_RELEASE=20220609 +ARG ODOO_SHA=5e30aa22df2239ecf42092b48fedcef72a98ed54 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From cea2870f5cf423746cd3dc5fb3110aeff9a33610 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 20 Jun 2022 08:54:12 +0200 Subject: [PATCH 091/208] [REF] Odoo 13.0-15.0: update to release 20220620 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 09eeef420..47c6f26cb 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220609 -ARG ODOO_SHA=bda7f94b0e8fb8bad3ff46db1ea1ca6928757533 +ARG ODOO_RELEASE=20220620 +ARG ODOO_SHA=6bfc680c42e4fd310281712c3467902d8db8cb56 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 161334b07..8bced32bb 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220609 -ARG ODOO_SHA=9587d138e05cac1d41cfb467adc6c034e842ca55 +ARG ODOO_RELEASE=20220620 +ARG ODOO_SHA=dc5475c3c9f9affc2f795be7922efc887d4a5d29 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 37a5a5523..ae4a1af39 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220609 -ARG ODOO_SHA=5e30aa22df2239ecf42092b48fedcef72a98ed54 +ARG ODOO_RELEASE=20220620 +ARG ODOO_SHA=38e219e59c019757bc0662e90e2f2586faf93f5e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 69194a6afafe50da6ff7cc0db0322f797b5f1386 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 29 Jun 2022 15:19:59 +0200 Subject: [PATCH 092/208] [REF] Odoo 13.0-15.0: update to release 20220629 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 47c6f26cb..6a5ba1cce 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220620 -ARG ODOO_SHA=6bfc680c42e4fd310281712c3467902d8db8cb56 +ARG ODOO_RELEASE=20220629 +ARG ODOO_SHA=e6873c12adae0dc8f8258d0e3b3d20f1f6408e4f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 8bced32bb..e9ab85be2 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220620 -ARG ODOO_SHA=dc5475c3c9f9affc2f795be7922efc887d4a5d29 +ARG ODOO_RELEASE=20220629 +ARG ODOO_SHA=ecd7c70bcc58d29d1d43b78a0785d9926fc569b0 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index ae4a1af39..ee2d4a352 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220620 -ARG ODOO_SHA=38e219e59c019757bc0662e90e2f2586faf93f5e +ARG ODOO_RELEASE=20220629 +ARG ODOO_SHA=412a8b14730e958db607a5287c6f93112b8c4f50 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From cbd79f009ae0131996c7e50c80db28196aa587ad Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 8 Jul 2022 15:27:15 +0200 Subject: [PATCH 093/208] [REF] Odoo 13.0-15.0: update to release 20220708 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 6a5ba1cce..b8ef3c638 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220629 -ARG ODOO_SHA=e6873c12adae0dc8f8258d0e3b3d20f1f6408e4f +ARG ODOO_RELEASE=20220708 +ARG ODOO_SHA=95fae6ca695e8f93d7eb6abb79b3813d1b5d926b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index e9ab85be2..e39a49eb1 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220629 -ARG ODOO_SHA=ecd7c70bcc58d29d1d43b78a0785d9926fc569b0 +ARG ODOO_RELEASE=20220708 +ARG ODOO_SHA=12774eac55ced7723f67be9e15577692162f4854 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index ee2d4a352..6f2f43c39 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220629 -ARG ODOO_SHA=412a8b14730e958db607a5287c6f93112b8c4f50 +ARG ODOO_RELEASE=20220708 +ARG ODOO_SHA=5e393909c75b3c85ddaaabf587c48197b800e68b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 037310071171bd8620734dd58f15e9d8d8f038b4 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 18 Jul 2022 08:33:17 +0200 Subject: [PATCH 094/208] [REF] Odoo 13.0-15.0: update to release 20220718 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index b8ef3c638..c1b959aa9 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220708 -ARG ODOO_SHA=95fae6ca695e8f93d7eb6abb79b3813d1b5d926b +ARG ODOO_RELEASE=20220718 +ARG ODOO_SHA=c96fedf5e961122bc9face8dba102105070cbfb7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index e39a49eb1..3c0ccb281 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220708 -ARG ODOO_SHA=12774eac55ced7723f67be9e15577692162f4854 +ARG ODOO_RELEASE=20220718 +ARG ODOO_SHA=c93ae8c22679a87d649157a3ddcc761600e28ee0 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 6f2f43c39..2f3248cd5 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220708 -ARG ODOO_SHA=5e393909c75b3c85ddaaabf587c48197b800e68b +ARG ODOO_RELEASE=20220718 +ARG ODOO_SHA=dc4a5b8c5be8f873e751539117f5aa41d9f7b217 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From d0da651ee7d5b52660d3601b798b770e50e2af9f Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 27 Jul 2022 08:56:02 +0200 Subject: [PATCH 095/208] [REF] Odoo 13.0-15.0: update to release 20220727 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index c1b959aa9..a4e099345 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220718 -ARG ODOO_SHA=c96fedf5e961122bc9face8dba102105070cbfb7 +ARG ODOO_RELEASE=20220727 +ARG ODOO_SHA=2671e352d9f46cc4ef24334cde0d4051634e9c61 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 3c0ccb281..37943506c 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220718 -ARG ODOO_SHA=c93ae8c22679a87d649157a3ddcc761600e28ee0 +ARG ODOO_RELEASE=20220727 +ARG ODOO_SHA=bd11bdc60157ae345991e230fa4fb77b79dd1467 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 2f3248cd5..4220f8ecb 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220718 -ARG ODOO_SHA=dc4a5b8c5be8f873e751539117f5aa41d9f7b217 +ARG ODOO_RELEASE=20220727 +ARG ODOO_SHA=bf4eae33f81c54c73b83d9c05a318b6e00b43e80 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 2cfc36507ecb28d73e894b02458c12a60f3359c1 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 12 Aug 2022 08:57:05 +0200 Subject: [PATCH 096/208] [REF] Odoo 13.0-15.0: update to release 20220812 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index a4e099345..45bfcb2ef 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220727 -ARG ODOO_SHA=2671e352d9f46cc4ef24334cde0d4051634e9c61 +ARG ODOO_RELEASE=20220812 +ARG ODOO_SHA=cde4183434f9004943b5ed5792c4d899e1901d06 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 37943506c..137356657 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220727 -ARG ODOO_SHA=bd11bdc60157ae345991e230fa4fb77b79dd1467 +ARG ODOO_RELEASE=20220812 +ARG ODOO_SHA=91048a02688e4d22aa188db7802e2eb6c07cb081 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 4220f8ecb..bb4372886 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220727 -ARG ODOO_SHA=bf4eae33f81c54c73b83d9c05a318b6e00b43e80 +ARG ODOO_RELEASE=20220812 +ARG ODOO_SHA=20c4eee998dc54c413d06bb17c59645a3d6a6e04 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 774bbf90ef2ff25098c4dea8f2dca5c0295b5afa Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 19 Aug 2022 09:15:18 +0200 Subject: [PATCH 097/208] [REF] Odoo 13.0-15.0: update to release 20220819 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 45bfcb2ef..34ff8039a 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220812 -ARG ODOO_SHA=cde4183434f9004943b5ed5792c4d899e1901d06 +ARG ODOO_RELEASE=20220819 +ARG ODOO_SHA=b4a67f4641a4f054287f8a38dd065b39a04a55db RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 137356657..560583adf 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220812 -ARG ODOO_SHA=91048a02688e4d22aa188db7802e2eb6c07cb081 +ARG ODOO_RELEASE=20220819 +ARG ODOO_SHA=019da831e2e16ca10c0486cf30ce7d980ea1db21 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index bb4372886..920fba9d1 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220812 -ARG ODOO_SHA=20c4eee998dc54c413d06bb17c59645a3d6a6e04 +ARG ODOO_RELEASE=20220819 +ARG ODOO_SHA=c64f22612a08f973ebe27394986dc7b6a39187d0 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 4174d74ed1383f9c366fba899763e1fb147712d8 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 26 Aug 2022 15:32:15 +0200 Subject: [PATCH 098/208] [REF] Odoo 13.0-15.0: update to release 20220826 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 34ff8039a..30ac8e229 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220819 -ARG ODOO_SHA=b4a67f4641a4f054287f8a38dd065b39a04a55db +ARG ODOO_RELEASE=20220826 +ARG ODOO_SHA=cf27da2394eaa4732b382482eb9733d09172a915 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 560583adf..ee68a22af 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220819 -ARG ODOO_SHA=019da831e2e16ca10c0486cf30ce7d980ea1db21 +ARG ODOO_RELEASE=20220826 +ARG ODOO_SHA=fe6467ecb51a5b5bf831a2c1021e77b2a890a01d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 920fba9d1..b9d952b4a 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220819 -ARG ODOO_SHA=c64f22612a08f973ebe27394986dc7b6a39187d0 +ARG ODOO_RELEASE=20220826 +ARG ODOO_SHA=e7155bae1d34b75cc34624e83b9b15992eab6b44 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 4550ffdc7480f51e34138a21812c98ba16c47551 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 2 Sep 2022 08:26:19 +0200 Subject: [PATCH 099/208] [REF] Odoo 13.0-15.0: update to release 20220902 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 30ac8e229..918a4696b 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220826 -ARG ODOO_SHA=cf27da2394eaa4732b382482eb9733d09172a915 +ARG ODOO_RELEASE=20220902 +ARG ODOO_SHA=d4da6396aed6e32579f525a45a22a5d4edfd3629 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index ee68a22af..26692f052 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220826 -ARG ODOO_SHA=fe6467ecb51a5b5bf831a2c1021e77b2a890a01d +ARG ODOO_RELEASE=20220902 +ARG ODOO_SHA=5dd3ba425de996c22c1f34383c8897f3c5930c0c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index b9d952b4a..3e62e7f93 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220826 -ARG ODOO_SHA=e7155bae1d34b75cc34624e83b9b15992eab6b44 +ARG ODOO_RELEASE=20220902 +ARG ODOO_SHA=f08078727fff11b2e0778627c476e7b95cbebdea RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 333b10955096da859c7f581935bd243bce743589 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 15 Sep 2022 11:01:32 +0200 Subject: [PATCH 100/208] [REF] Odoo 13.0-15.0: update to release 20220915 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 918a4696b..17fcbc01c 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220902 -ARG ODOO_SHA=d4da6396aed6e32579f525a45a22a5d4edfd3629 +ARG ODOO_RELEASE=20220915 +ARG ODOO_SHA=c2e9376f0bda9bb11bc102e038594da452b38198 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 26692f052..4c8987c1a 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220902 -ARG ODOO_SHA=5dd3ba425de996c22c1f34383c8897f3c5930c0c +ARG ODOO_RELEASE=20220915 +ARG ODOO_SHA=263af0514d9354069c62bbe9d552c3fea01e918f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 3e62e7f93..2dbc5cee6 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220902 -ARG ODOO_SHA=f08078727fff11b2e0778627c476e7b95cbebdea +ARG ODOO_RELEASE=20220915 +ARG ODOO_SHA=77cb3593717a0b272c5c65a8b493ebb1d96c954c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 26df6d6eef8df7a9927fbdade79772455de7e8eb Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 5 Oct 2022 13:23:51 +0200 Subject: [PATCH 101/208] [REF] Odoo 13.0-15.0: update to release 20221005 --- 13.0/Dockerfile | 4 ++-- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 17fcbc01c..4ee134825 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -54,8 +54,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20220915 -ARG ODOO_SHA=c2e9376f0bda9bb11bc102e038594da452b38198 +ARG ODOO_RELEASE=20221005 +ARG ODOO_SHA=2971414babd77550e662238e94d12142bcf07abf RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 4c8987c1a..af5ccf007 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20220915 -ARG ODOO_SHA=263af0514d9354069c62bbe9d552c3fea01e918f +ARG ODOO_RELEASE=20221005 +ARG ODOO_SHA=0b73069923e9be8f293b0344baacf39282bf2eb7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 2dbc5cee6..6851fa964 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20220915 -ARG ODOO_SHA=77cb3593717a0b272c5c65a8b493ebb1d96c954c +ARG ODOO_RELEASE=20221005 +ARG ODOO_SHA=60bdd7c9073b1d4252e081dfbdb33b741fef623d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From bf355c8dd0fba81a45ff1ff0d6be773b38d67289 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 12 Oct 2022 16:31:52 +0200 Subject: [PATCH 102/208] [REM] Odoo 13.0: remove deprecated version --- 13.0/Dockerfile | 87 ------------------------------------------- 13.0/entrypoint.sh | 49 ------------------------ 13.0/odoo.conf | 37 ------------------ 13.0/wait-for-psql.py | 32 ---------------- 4 files changed, 205 deletions(-) delete mode 100644 13.0/Dockerfile delete mode 100755 13.0/entrypoint.sh delete mode 100644 13.0/odoo.conf delete mode 100755 13.0/wait-for-psql.py diff --git a/13.0/Dockerfile b/13.0/Dockerfile deleted file mode 100644 index 4ee134825..000000000 --- a/13.0/Dockerfile +++ /dev/null @@ -1,87 +0,0 @@ -FROM debian:buster-slim -MAINTAINER Odoo S.A. - -SHELL ["/bin/bash", "-xo", "pipefail", "-c"] - -# Generate locale C.UTF-8 for postgres and general locale data -ENV LANG C.UTF-8 - -# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - dirmngr \ - fonts-noto-cjk \ - gnupg \ - libssl-dev \ - node-less \ - npm \ - python3-num2words \ - python3-pip \ - python3-phonenumbers \ - python3-pyldap \ - python3-qrcode \ - python3-renderpm \ - python3-setuptools \ - python3-slugify \ - python3-vobject \ - python3-watchdog \ - python3-xlrd \ - python3-xlwt \ - xz-utils \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ - && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ - && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb - -# install latest postgresql-client -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ - && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && apt-get update \ - && apt-get install --no-install-recommends -y postgresql-client \ - && rm -f /etc/apt/sources.list.d/pgdg.list \ - && rm -rf /var/lib/apt/lists/* - -# Install rtlcss (on Debian buster) -RUN npm install -g rtlcss - -# Install Odoo -ENV ODOO_VERSION 13.0 -ARG ODOO_RELEASE=20221005 -ARG ODOO_SHA=2971414babd77550e662238e94d12142bcf07abf -RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ - && apt-get update \ - && apt-get -y install --no-install-recommends ./odoo.deb \ - && rm -rf /var/lib/apt/lists/* odoo.deb - -# Copy entrypoint script and Odoo configuration file -COPY ./entrypoint.sh / -COPY ./odoo.conf /etc/odoo/ - -# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons -RUN chown odoo /etc/odoo/odoo.conf \ - && mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons -VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] - -# Expose Odoo services -EXPOSE 8069 8071 8072 - -# Set the default config file -ENV ODOO_RC /etc/odoo/odoo.conf - -COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py - -# Set default user when running the container -USER odoo - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["odoo"] diff --git a/13.0/entrypoint.sh b/13.0/entrypoint.sh deleted file mode 100755 index f802bcb25..000000000 --- a/13.0/entrypoint.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -set -e - -if [ -v PASSWORD_FILE ]; then - PASSWORD="$(< $PASSWORD_FILE)" -fi - -# set the postgres database host, port, user and password according to the environment -# and pass them as arguments to the odoo process if not present in the config file -: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} -: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} -: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} - -DB_ARGS=() -function check_config() { - param="$1" - value="$2" - if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then - value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') - fi; - DB_ARGS+=("--${param}") - DB_ARGS+=("${value}") -} -check_config "db_host" "$HOST" -check_config "db_port" "$PORT" -check_config "db_user" "$USER" -check_config "db_password" "$PASSWORD" - -case "$1" in - -- | odoo) - shift - if [[ "$1" == "scaffold" ]] ; then - exec odoo "$@" - else - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - fi - ;; - -*) - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - ;; - *) - exec "$@" -esac - -exit 1 diff --git a/13.0/odoo.conf b/13.0/odoo.conf deleted file mode 100644 index 28f70c105..000000000 --- a/13.0/odoo.conf +++ /dev/null @@ -1,37 +0,0 @@ -[options] -addons_path = /mnt/extra-addons -data_dir = /var/lib/odoo -; admin_passwd = admin -; csv_internal_sep = , -; db_maxconn = 64 -; db_name = False -; db_template = template1 -; dbfilter = .* -; debug_mode = False -; email_from = False -; limit_memory_hard = 2684354560 -; limit_memory_soft = 2147483648 -; limit_request = 8192 -; limit_time_cpu = 60 -; limit_time_real = 120 -; list_db = True -; log_db = False -; log_handler = [':INFO'] -; log_level = info -; logfile = None -; longpolling_port = 8072 -; max_cron_threads = 2 -; osv_memory_age_limit = 1.0 -; osv_memory_count_limit = False -; smtp_password = False -; smtp_port = 25 -; smtp_server = localhost -; smtp_ssl = False -; smtp_user = False -; workers = 0 -; xmlrpc = True -; xmlrpc_interface = -; xmlrpc_port = 8069 -; xmlrpcs = True -; xmlrpcs_interface = -; xmlrpcs_port = 8071 diff --git a/13.0/wait-for-psql.py b/13.0/wait-for-psql.py deleted file mode 100755 index a55f44098..000000000 --- a/13.0/wait-for-psql.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import psycopg2 -import sys -import time - - -if __name__ == '__main__': - arg_parser = argparse.ArgumentParser() - arg_parser.add_argument('--db_host', required=True) - arg_parser.add_argument('--db_port', required=True) - arg_parser.add_argument('--db_user', required=True) - arg_parser.add_argument('--db_password', required=True) - arg_parser.add_argument('--timeout', type=int, default=5) - - args = arg_parser.parse_args() - - start_time = time.time() - while (time.time() - start_time) < args.timeout: - try: - conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') - error = '' - break - except psycopg2.OperationalError as e: - error = e - else: - conn.close() - time.sleep(1) - - if error: - print("Database connection failure: %s" % error, file=sys.stderr) - sys.exit(1) From bb1557df5b9d06e0eaf6b132b55a332db6ac93f4 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 12 Oct 2022 16:39:40 +0200 Subject: [PATCH 103/208] [REF] Odoo 14.0-15.0: bump to release 20221012 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index af5ccf007..78ea12090 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20221005 -ARG ODOO_SHA=0b73069923e9be8f293b0344baacf39282bf2eb7 +ARG ODOO_RELEASE=20221012 +ARG ODOO_SHA=f938f53b8c9de5bb941bffbca1eb4d6bf44fa314 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 6851fa964..65f60b664 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20221005 -ARG ODOO_SHA=60bdd7c9073b1d4252e081dfbdb33b741fef623d +ARG ODOO_RELEASE=20221012 +ARG ODOO_SHA=55bf57fd9544ba5ea4033507eaf424cbbf1e95dc RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From ad549a7c3602557abc44e9c04369965a73d78fcd Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 12 Oct 2022 16:41:02 +0200 Subject: [PATCH 104/208] [ADD] Odoo: 16.0 --- 16.0/Dockerfile | 88 +++++++++++++++++++++++++++++++++++++++++++ 16.0/entrypoint.sh | 49 ++++++++++++++++++++++++ 16.0/odoo.conf | 37 ++++++++++++++++++ 16.0/wait-for-psql.py | 32 ++++++++++++++++ 4 files changed, 206 insertions(+) create mode 100644 16.0/Dockerfile create mode 100755 16.0/entrypoint.sh create mode 100644 16.0/odoo.conf create mode 100755 16.0/wait-for-psql.py diff --git a/16.0/Dockerfile b/16.0/Dockerfile new file mode 100644 index 000000000..92581ff18 --- /dev/null +++ b/16.0/Dockerfile @@ -0,0 +1,88 @@ +FROM debian:bullseye-slim +MAINTAINER Odoo S.A. + +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + +# Generate locale C.UTF-8 for postgres and general locale data +ENV LANG C.UTF-8 + +# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + dirmngr \ + fonts-noto-cjk \ + gnupg \ + libssl-dev \ + node-less \ + npm \ + python3-num2words \ + python3-pdfminer \ + python3-pip \ + python3-phonenumbers \ + python3-pyldap \ + python3-qrcode \ + python3-renderpm \ + python3-setuptools \ + python3-slugify \ + python3-vobject \ + python3-watchdog \ + python3-xlrd \ + python3-xlwt \ + xz-utils \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ + && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb + +# install latest postgresql-client +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ + && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ + && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ + && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && apt-get update \ + && apt-get install --no-install-recommends -y postgresql-client \ + && rm -f /etc/apt/sources.list.d/pgdg.list \ + && rm -rf /var/lib/apt/lists/* + +# Install rtlcss (on Debian buster) +RUN npm install -g rtlcss + +# Install Odoo +ENV ODOO_VERSION 16.0 +ARG ODOO_RELEASE=20221012 +ARG ODOO_SHA=f34bc089609c2a7da65f25f29cf4e0218c7af464 +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ + && apt-get update \ + && apt-get -y install --no-install-recommends ./odoo.deb \ + && rm -rf /var/lib/apt/lists/* odoo.deb + +# Copy entrypoint script and Odoo configuration file +COPY ./entrypoint.sh / +COPY ./odoo.conf /etc/odoo/ + +# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons +RUN chown odoo /etc/odoo/odoo.conf \ + && mkdir -p /mnt/extra-addons \ + && chown -R odoo /mnt/extra-addons +VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] + +# Expose Odoo services +EXPOSE 8069 8071 8072 + +# Set the default config file +ENV ODOO_RC /etc/odoo/odoo.conf + +COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py + +# Set default user when running the container +USER odoo + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["odoo"] diff --git a/16.0/entrypoint.sh b/16.0/entrypoint.sh new file mode 100755 index 000000000..f802bcb25 --- /dev/null +++ b/16.0/entrypoint.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +set -e + +if [ -v PASSWORD_FILE ]; then + PASSWORD="$(< $PASSWORD_FILE)" +fi + +# set the postgres database host, port, user and password according to the environment +# and pass them as arguments to the odoo process if not present in the config file +: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} + +DB_ARGS=() +function check_config() { + param="$1" + value="$2" + if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then + value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') + fi; + DB_ARGS+=("--${param}") + DB_ARGS+=("${value}") +} +check_config "db_host" "$HOST" +check_config "db_port" "$PORT" +check_config "db_user" "$USER" +check_config "db_password" "$PASSWORD" + +case "$1" in + -- | odoo) + shift + if [[ "$1" == "scaffold" ]] ; then + exec odoo "$@" + else + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + fi + ;; + -*) + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + ;; + *) + exec "$@" +esac + +exit 1 diff --git a/16.0/odoo.conf b/16.0/odoo.conf new file mode 100644 index 000000000..28f70c105 --- /dev/null +++ b/16.0/odoo.conf @@ -0,0 +1,37 @@ +[options] +addons_path = /mnt/extra-addons +data_dir = /var/lib/odoo +; admin_passwd = admin +; csv_internal_sep = , +; db_maxconn = 64 +; db_name = False +; db_template = template1 +; dbfilter = .* +; debug_mode = False +; email_from = False +; limit_memory_hard = 2684354560 +; limit_memory_soft = 2147483648 +; limit_request = 8192 +; limit_time_cpu = 60 +; limit_time_real = 120 +; list_db = True +; log_db = False +; log_handler = [':INFO'] +; log_level = info +; logfile = None +; longpolling_port = 8072 +; max_cron_threads = 2 +; osv_memory_age_limit = 1.0 +; osv_memory_count_limit = False +; smtp_password = False +; smtp_port = 25 +; smtp_server = localhost +; smtp_ssl = False +; smtp_user = False +; workers = 0 +; xmlrpc = True +; xmlrpc_interface = +; xmlrpc_port = 8069 +; xmlrpcs = True +; xmlrpcs_interface = +; xmlrpcs_port = 8071 diff --git a/16.0/wait-for-psql.py b/16.0/wait-for-psql.py new file mode 100755 index 000000000..a55f44098 --- /dev/null +++ b/16.0/wait-for-psql.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 +import argparse +import psycopg2 +import sys +import time + + +if __name__ == '__main__': + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument('--db_host', required=True) + arg_parser.add_argument('--db_port', required=True) + arg_parser.add_argument('--db_user', required=True) + arg_parser.add_argument('--db_password', required=True) + arg_parser.add_argument('--timeout', type=int, default=5) + + args = arg_parser.parse_args() + + start_time = time.time() + while (time.time() - start_time) < args.timeout: + try: + conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') + error = '' + break + except psycopg2.OperationalError as e: + error = e + else: + conn.close() + time.sleep(1) + + if error: + print("Database connection failure: %s" % error, file=sys.stderr) + sys.exit(1) From 7f37c5532effd79cd96b4f0ab9303a82a0f924e8 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 25 Oct 2022 13:50:38 +0200 Subject: [PATCH 105/208] [REF] Odoo 14.0-16.0: update to release 20221025 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 78ea12090..520e4b639 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20221012 -ARG ODOO_SHA=f938f53b8c9de5bb941bffbca1eb4d6bf44fa314 +ARG ODOO_RELEASE=20221025 +ARG ODOO_SHA=3be24ed710e51041a1b23d2ae55408077572cc5a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 65f60b664..cb17c4174 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20221012 -ARG ODOO_SHA=55bf57fd9544ba5ea4033507eaf424cbbf1e95dc +ARG ODOO_RELEASE=20221025 +ARG ODOO_SHA=923fdec85ac9a4230fc93af00d12d8911a0613b4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 92581ff18..b3d76ceea 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20221012 -ARG ODOO_SHA=f34bc089609c2a7da65f25f29cf4e0218c7af464 +ARG ODOO_RELEASE=20221025 +ARG ODOO_SHA=b05756b507d2bdad65a0d76f88b0a90719ff0e44 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 0d7a76b1e4a50ecbfdf7ab4dc7fdf91eadffa974 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 4 Nov 2022 14:48:15 +0100 Subject: [PATCH 106/208] [REF] Odoo 14.0-16.0: update to release 20221104 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 520e4b639..8b66dc5e5 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20221025 -ARG ODOO_SHA=3be24ed710e51041a1b23d2ae55408077572cc5a +ARG ODOO_RELEASE=20221104 +ARG ODOO_SHA=43aca21407e6fa13957a1ab9e56a268f9d0bbc0b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index cb17c4174..8a6960e6c 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20221025 -ARG ODOO_SHA=923fdec85ac9a4230fc93af00d12d8911a0613b4 +ARG ODOO_RELEASE=20221104 +ARG ODOO_SHA=0d374f0057f67fcece809b1c6acc3b8ad7b0c204 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index b3d76ceea..f00172f86 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20221025 -ARG ODOO_SHA=b05756b507d2bdad65a0d76f88b0a90719ff0e44 +ARG ODOO_RELEASE=20221104 +ARG ODOO_SHA=992e4f25439ce8adf4c235d3a3876f4191404ef8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 456817151ac2b45022d0663bfdaf8d83707e847a Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 16 Nov 2022 09:52:29 +0100 Subject: [PATCH 107/208] [REF] Odoo 14.0-16.0: update to release 20221116 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 8b66dc5e5..1dd1c3ff7 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20221104 -ARG ODOO_SHA=43aca21407e6fa13957a1ab9e56a268f9d0bbc0b +ARG ODOO_RELEASE=20221116 +ARG ODOO_SHA=e547e291f4ee0cc779f0d4a30fd6e4463bb21910 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 8a6960e6c..da3dc7a94 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20221104 -ARG ODOO_SHA=0d374f0057f67fcece809b1c6acc3b8ad7b0c204 +ARG ODOO_RELEASE=20221116 +ARG ODOO_SHA=2e8e5d5851e711fe1e1b19dad9dce224fa2ef25f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index f00172f86..0c6384aaa 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20221104 -ARG ODOO_SHA=992e4f25439ce8adf4c235d3a3876f4191404ef8 +ARG ODOO_RELEASE=20221116 +ARG ODOO_SHA=ccf93359e8685c4d47d15636cc0c6a1f8ae9b52e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 7f1788b597f69ba59dcb8d7b8d92ab1693bc7ee1 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 2 Dec 2022 10:00:45 +0100 Subject: [PATCH 108/208] [REF] Odoo 14.0-16.0: update to release 20221202 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 1dd1c3ff7..675ee4d4d 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20221116 -ARG ODOO_SHA=e547e291f4ee0cc779f0d4a30fd6e4463bb21910 +ARG ODOO_RELEASE=20221202 +ARG ODOO_SHA=41a75eecbf06b0adfc5537a476e406d28557f938 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index da3dc7a94..452b50b73 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20221116 -ARG ODOO_SHA=2e8e5d5851e711fe1e1b19dad9dce224fa2ef25f +ARG ODOO_RELEASE=20221202 +ARG ODOO_SHA=d0ee50281624260267085ee90302d1fe422eebbb RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 0c6384aaa..b5d3cf67a 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20221116 -ARG ODOO_SHA=ccf93359e8685c4d47d15636cc0c6a1f8ae9b52e +ARG ODOO_RELEASE=20221202 +ARG ODOO_SHA=3ffc37e18490c281cae46fc5cb52edbf7e41738a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 4dc567d99e0fb6cdef4cab2025c0caa3b52987b7 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 16 Dec 2022 14:26:57 +0100 Subject: [PATCH 109/208] [REF] Odoo 14.0-16.0: update to release 20221216 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 675ee4d4d..962dabcc8 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20221202 -ARG ODOO_SHA=41a75eecbf06b0adfc5537a476e406d28557f938 +ARG ODOO_RELEASE=20221216 +ARG ODOO_SHA=cf0fc33d169a845691b71cc03cfbaa7787b20b04 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 452b50b73..c394d2434 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20221202 -ARG ODOO_SHA=d0ee50281624260267085ee90302d1fe422eebbb +ARG ODOO_RELEASE=20221216 +ARG ODOO_SHA=db18fade18d691716ccb67ddbd583e288d4762be RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index b5d3cf67a..d0daf3394 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20221202 -ARG ODOO_SHA=3ffc37e18490c281cae46fc5cb52edbf7e41738a +ARG ODOO_RELEASE=20221216 +ARG ODOO_SHA=f6aeed95ae4fe3c891fe7c35e0dc08e83553493d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From bd0749b2bf01fd5b854ea87becd67c053e90698b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 26 Dec 2022 09:49:03 +0100 Subject: [PATCH 110/208] [REF] Odoo 14.0-16.0: update to release 20221226 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 962dabcc8..0d7090364 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20221216 -ARG ODOO_SHA=cf0fc33d169a845691b71cc03cfbaa7787b20b04 +ARG ODOO_RELEASE=20221226 +ARG ODOO_SHA=ec385462138e5027be4cf452844a3df3a8ef3573 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index c394d2434..8747cc56a 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20221216 -ARG ODOO_SHA=db18fade18d691716ccb67ddbd583e288d4762be +ARG ODOO_RELEASE=20221226 +ARG ODOO_SHA=37216e653c8db933790cc994b7cbad526a285e2b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index d0daf3394..acb8be973 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20221216 -ARG ODOO_SHA=f6aeed95ae4fe3c891fe7c35e0dc08e83553493d +ARG ODOO_RELEASE=20221226 +ARG ODOO_SHA=09e2bc4c27fc92a7f26928de61c122d18f550917 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 9674beb8a5ae48981bae2266b8c373d4eb7dd5e7 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 9 Jan 2023 10:41:44 +0100 Subject: [PATCH 111/208] [REF] Odoo 14.0-16.0: update to release 20230109 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 0d7090364..6dd7a8566 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20221226 -ARG ODOO_SHA=ec385462138e5027be4cf452844a3df3a8ef3573 +ARG ODOO_RELEASE=20230109 +ARG ODOO_SHA=ef9eef9a5e5bbeb455ac7d1c05cc675e74876609 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 8747cc56a..575181244 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20221226 -ARG ODOO_SHA=37216e653c8db933790cc994b7cbad526a285e2b +ARG ODOO_RELEASE=20230109 +ARG ODOO_SHA=618e45490616f63dfb68077523c2971cbb6cdda7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index acb8be973..04209e482 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20221226 -ARG ODOO_SHA=09e2bc4c27fc92a7f26928de61c122d18f550917 +ARG ODOO_RELEASE=20230109 +ARG ODOO_SHA=884bf72c7318835b9ac56be2594032cbba7b8c7b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 2c634b7e37d7deaddd2d36b1b7fe811db5fa6367 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 10 Feb 2023 16:57:12 +0100 Subject: [PATCH 112/208] [REF] Odoo 14.0-16.0: update to release 20230210 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 6dd7a8566..c74f90aed 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230109 -ARG ODOO_SHA=ef9eef9a5e5bbeb455ac7d1c05cc675e74876609 +ARG ODOO_RELEASE=20230210 +ARG ODOO_SHA=c10f97e1877f5e9173c24efdcbed129bd21328c4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 575181244..1f1dff717 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230109 -ARG ODOO_SHA=618e45490616f63dfb68077523c2971cbb6cdda7 +ARG ODOO_RELEASE=20230210 +ARG ODOO_SHA=c8f3d1b3af6847c9b4e9d4750e0fc34b303911c7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 04209e482..ef6393dac 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230109 -ARG ODOO_SHA=884bf72c7318835b9ac56be2594032cbba7b8c7b +ARG ODOO_RELEASE=20230210 +ARG ODOO_SHA=57e7b2c7c1ca2fd82e430cd44d46453bc74daf47 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From ff99b5f50135f74c22f163dacfde34189857c13b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 24 Feb 2023 14:15:19 +0100 Subject: [PATCH 113/208] [REF] Odoo 14.0-16.0: update to release 20230224 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index c74f90aed..dc0326938 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230210 -ARG ODOO_SHA=c10f97e1877f5e9173c24efdcbed129bd21328c4 +ARG ODOO_RELEASE=20230224 +ARG ODOO_SHA=a59688f0c2c830f243fec130e3c651d93f188658 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 1f1dff717..f2940328e 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230210 -ARG ODOO_SHA=c8f3d1b3af6847c9b4e9d4750e0fc34b303911c7 +ARG ODOO_RELEASE=20230224 +ARG ODOO_SHA=44613aceddf8e928ca50fc23979b1141fa4bb7d5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index ef6393dac..087af1f10 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230210 -ARG ODOO_SHA=57e7b2c7c1ca2fd82e430cd44d46453bc74daf47 +ARG ODOO_RELEASE=20230224 +ARG ODOO_SHA=2a4ed4c36b82a05707b6e709182266672a32ace2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 870aef4a7a3f0befdd7fc8ef7ffe8f9d07df7794 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 10 Mar 2023 13:28:11 +0100 Subject: [PATCH 114/208] [REF] Odoo 14.0-16.0: update to release 20230310 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index dc0326938..649d93f23 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230224 -ARG ODOO_SHA=a59688f0c2c830f243fec130e3c651d93f188658 +ARG ODOO_RELEASE=20230310 +ARG ODOO_SHA=37bba47bc9c24ce6e68d4fe9255d6ac609eeea68 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index f2940328e..cc7357cb5 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230224 -ARG ODOO_SHA=44613aceddf8e928ca50fc23979b1141fa4bb7d5 +ARG ODOO_RELEASE=20230310 +ARG ODOO_SHA=bb55d17bc0ae4d0d084c20d3382b6ece49718cbb RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 087af1f10..e11a7819b 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230224 -ARG ODOO_SHA=2a4ed4c36b82a05707b6e709182266672a32ace2 +ARG ODOO_RELEASE=20230310 +ARG ODOO_SHA=98ae3919fe80e537531c55d74e91f57853e7a67a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From c61918a02765974a17097ec65695828422afe519 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 17 Mar 2023 09:43:52 +0100 Subject: [PATCH 115/208] [REF] Odoo 14.0-16.0: update to release 20230317 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 649d93f23..e9915d568 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230310 -ARG ODOO_SHA=37bba47bc9c24ce6e68d4fe9255d6ac609eeea68 +ARG ODOO_RELEASE=20230317 +ARG ODOO_SHA=4b677e345f13d6421d78f6a3f3dce4ccf6bd2a99 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index cc7357cb5..b847e0396 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230310 -ARG ODOO_SHA=bb55d17bc0ae4d0d084c20d3382b6ece49718cbb +ARG ODOO_RELEASE=20230317 +ARG ODOO_SHA=2ebd7a6c36e415ed18a19148d2a1d8958d140bef RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index e11a7819b..2cd9b36a0 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230310 -ARG ODOO_SHA=98ae3919fe80e537531c55d74e91f57853e7a67a +ARG ODOO_RELEASE=20230317 +ARG ODOO_SHA=13d351efd1263e2db7788a7c4995935752eab898 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 8be11ad8773c735755378d7ac6399a7bdacd2479 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 29 Mar 2023 12:16:06 +0200 Subject: [PATCH 116/208] [REF] Odoo 14.0-16.0: update to release 20230329 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index e9915d568..4fb660102 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230317 -ARG ODOO_SHA=4b677e345f13d6421d78f6a3f3dce4ccf6bd2a99 +ARG ODOO_RELEASE=20230329 +ARG ODOO_SHA=940676f897cf2e7cf056ce665ebea9385c80dfcb RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index b847e0396..b622b4401 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230317 -ARG ODOO_SHA=2ebd7a6c36e415ed18a19148d2a1d8958d140bef +ARG ODOO_RELEASE=20230329 +ARG ODOO_SHA=6e714b334c69b3ed396ce5f5c5a87603736bce80 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 2cd9b36a0..aa348d7a0 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230317 -ARG ODOO_SHA=13d351efd1263e2db7788a7c4995935752eab898 +ARG ODOO_RELEASE=20230329 +ARG ODOO_SHA=21ec62a768439b5a2ce736aba6899801e73073a6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From df8788b1e0cc6e7570869a20a17f482c71bcf6c7 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 18 Apr 2023 14:36:53 +0200 Subject: [PATCH 117/208] [REF] Odoo 14.0-16.0: update to release 20230418 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 4fb660102..2deeabec3 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230329 -ARG ODOO_SHA=940676f897cf2e7cf056ce665ebea9385c80dfcb +ARG ODOO_RELEASE=20230418 +ARG ODOO_SHA=328906b0728ba10b19ce1ef5c4d98caba2fb38dd RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index b622b4401..4973feb75 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230329 -ARG ODOO_SHA=6e714b334c69b3ed396ce5f5c5a87603736bce80 +ARG ODOO_RELEASE=20230418 +ARG ODOO_SHA=429b040f5ac5dd1b0c55d1ea7cb7063645479a8e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index aa348d7a0..6312b0178 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230329 -ARG ODOO_SHA=21ec62a768439b5a2ce736aba6899801e73073a6 +ARG ODOO_RELEASE=20230418 +ARG ODOO_SHA=0a06b542c7cca901ff0c10439f948ac4645e319a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From f7b3182bdccd5e182ecabcb7243696961194f601 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Sun, 30 Apr 2023 09:13:00 +0200 Subject: [PATCH 118/208] [REF] Odoo 14.0-16.0: update to release 20230430 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 2deeabec3..df7a31c57 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230418 -ARG ODOO_SHA=328906b0728ba10b19ce1ef5c4d98caba2fb38dd +ARG ODOO_RELEASE=20230430 +ARG ODOO_SHA=06586ebb9902fa4840fb177f5e45f98d19dadf6d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 4973feb75..1952f18a6 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230418 -ARG ODOO_SHA=429b040f5ac5dd1b0c55d1ea7cb7063645479a8e +ARG ODOO_RELEASE=20230430 +ARG ODOO_SHA=af1128e5d8126e079a968ec22696a122965a4404 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 6312b0178..eaaacd467 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230418 -ARG ODOO_SHA=0a06b542c7cca901ff0c10439f948ac4645e319a +ARG ODOO_RELEASE=20230430 +ARG ODOO_SHA=1d8d64fec19fc1c31e13d9d9cdc4b127ba4e72cd RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 789b7ff9dc2b9647276d8497957cf19de9e83a01 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 17 May 2023 14:53:49 +0200 Subject: [PATCH 119/208] [REF] Odoo 14.0-16.0: update to release 20230517 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index df7a31c57..32f24de13 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230430 -ARG ODOO_SHA=06586ebb9902fa4840fb177f5e45f98d19dadf6d +ARG ODOO_RELEASE=20230517 +ARG ODOO_SHA=9c10e921b14f55e1d2c24283f5485037428b7c78 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 1952f18a6..435dab0f7 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230430 -ARG ODOO_SHA=af1128e5d8126e079a968ec22696a122965a4404 +ARG ODOO_RELEASE=20230517 +ARG ODOO_SHA=63d84430c70fef2fdf8d384c7e58bd563c287b2b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index eaaacd467..af83c04b6 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230430 -ARG ODOO_SHA=1d8d64fec19fc1c31e13d9d9cdc4b127ba4e72cd +ARG ODOO_RELEASE=20230517 +ARG ODOO_SHA=e737da6d601f011803fa66c6af297688c3e45fd4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 42cc6f7d3a35dd7ab2353e09cfecf48c1bf50ee1 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 30 May 2023 10:56:24 +0200 Subject: [PATCH 120/208] [REF] Odoo 14.0-16.0: update to release 20230530 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 32f24de13..e673bf24f 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230517 -ARG ODOO_SHA=9c10e921b14f55e1d2c24283f5485037428b7c78 +ARG ODOO_RELEASE=20230530 +ARG ODOO_SHA=307f5ebc95342d3114091fbe1d9d00ab684507c5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 435dab0f7..bf305d6ef 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230517 -ARG ODOO_SHA=63d84430c70fef2fdf8d384c7e58bd563c287b2b +ARG ODOO_RELEASE=20230530 +ARG ODOO_SHA=b7017cc3f757c1ecb1545f784c558ef5c0387030 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index af83c04b6..2e0480a82 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230517 -ARG ODOO_SHA=e737da6d601f011803fa66c6af297688c3e45fd4 +ARG ODOO_RELEASE=20230530 +ARG ODOO_SHA=e7ddf8de9873c66ef887c5bf23b3698673a1ba35 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From d53cb2ceb0697488aaeaf9e98f678d7fab49d7d5 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 5 Jun 2023 13:45:47 +0200 Subject: [PATCH 121/208] 16.0: add python3-magic and python3-odf While not strictly required, those packages may improve the user experience. --- 16.0/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 2e0480a82..fd0d9cc58 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -17,7 +17,9 @@ RUN apt-get update && \ libssl-dev \ node-less \ npm \ + python3-magic \ python3-num2words \ + python3-odf \ python3-pdfminer \ python3-pip \ python3-phonenumbers \ From 7a7169250712b280c009e6e507f0c97a68e9c5c0 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 13 Jun 2023 14:52:34 +0200 Subject: [PATCH 122/208] [REF] Odoo 14.0-16.0: update to release 20230613 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index e673bf24f..cffe398c3 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230530 -ARG ODOO_SHA=307f5ebc95342d3114091fbe1d9d00ab684507c5 +ARG ODOO_RELEASE=20230613 +ARG ODOO_SHA=e73fbeab19595d52e7ebae3081d3989ee415f43f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index bf305d6ef..a9ee40ca1 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230530 -ARG ODOO_SHA=b7017cc3f757c1ecb1545f784c558ef5c0387030 +ARG ODOO_RELEASE=20230613 +ARG ODOO_SHA=069b72fbdce8c39278961f659a16b244c94ea83b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index fd0d9cc58..8cd23bf2f 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -57,8 +57,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230530 -ARG ODOO_SHA=e7ddf8de9873c66ef887c5bf23b3698673a1ba35 +ARG ODOO_RELEASE=20230613 +ARG ODOO_SHA=5cd43e65a2c3836894e14fc902a935bf84c64877 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 672d5cda913ff3ef6eaa1ae25de0ca7c0336f05b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 29 Jun 2023 10:12:24 +0200 Subject: [PATCH 123/208] [REF] Odoo 14.0-16.0: update to release 20230629 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index cffe398c3..590f88346 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230613 -ARG ODOO_SHA=e73fbeab19595d52e7ebae3081d3989ee415f43f +ARG ODOO_RELEASE=20230629 +ARG ODOO_SHA=621799a3ab09aacdf4139b3dbea6af48a2fb0df0 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index a9ee40ca1..7f451daa9 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230613 -ARG ODOO_SHA=069b72fbdce8c39278961f659a16b244c94ea83b +ARG ODOO_RELEASE=20230629 +ARG ODOO_SHA=0d61fc77caa30bb4687fe3418606581f29bbb6ae RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 8cd23bf2f..6cc237703 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -57,8 +57,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230613 -ARG ODOO_SHA=5cd43e65a2c3836894e14fc902a935bf84c64877 +ARG ODOO_RELEASE=20230629 +ARG ODOO_SHA=ef1a7436be87a897efa0d0b4a50a159d2ee3e1e3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 36d6e05b76d56ce637c2f39fd4745c6d2fa3809f Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 10 Jul 2023 09:07:28 +0200 Subject: [PATCH 124/208] [REF] Odoo 14.0-16.0: update to release 20230710 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 590f88346..2e395a73c 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230629 -ARG ODOO_SHA=621799a3ab09aacdf4139b3dbea6af48a2fb0df0 +ARG ODOO_RELEASE=20230710 +ARG ODOO_SHA=d4c7092155bf60291864cc8071333cc4ef122194 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 7f451daa9..cedd7d120 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230629 -ARG ODOO_SHA=0d61fc77caa30bb4687fe3418606581f29bbb6ae +ARG ODOO_RELEASE=20230710 +ARG ODOO_SHA=e525263145212a77ae35a6f80a3f269d52547226 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 6cc237703..ab7f548ea 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -57,8 +57,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230629 -ARG ODOO_SHA=ef1a7436be87a897efa0d0b4a50a159d2ee3e1e3 +ARG ODOO_RELEASE=20230710 +ARG ODOO_SHA=faf46a6ddcf6a8d4d30a743c389db0e414071ce4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 80cde78131df9c17dc0c370ed8f8db1a33c54692 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 20 Jul 2023 14:44:06 +0200 Subject: [PATCH 125/208] [REF] Odoo 14.0-16.0: update to release 20230720 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 2e395a73c..c951980bb 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230710 -ARG ODOO_SHA=d4c7092155bf60291864cc8071333cc4ef122194 +ARG ODOO_RELEASE=20230720 +ARG ODOO_SHA=41b37bf9b9e9769045f07c5bbf152e7819f49885 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index cedd7d120..0b7bcd8ae 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230710 -ARG ODOO_SHA=e525263145212a77ae35a6f80a3f269d52547226 +ARG ODOO_RELEASE=20230720 +ARG ODOO_SHA=5d5fb2e548734dcee584614d2385afc8f877eadc RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index ab7f548ea..3b63530bc 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -57,8 +57,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230710 -ARG ODOO_SHA=faf46a6ddcf6a8d4d30a743c389db0e414071ce4 +ARG ODOO_RELEASE=20230720 +ARG ODOO_SHA=a8aa7b6dcd8722065d426526d06b76513fb0500e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From bab3af70772ff02f799469f53a38a4a0e5003703 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 7 Aug 2023 16:32:00 +0200 Subject: [PATCH 126/208] [REF] Odoo 14.0-16.0: update to release 20230807 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index c951980bb..f07104751 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230720 -ARG ODOO_SHA=41b37bf9b9e9769045f07c5bbf152e7819f49885 +ARG ODOO_RELEASE=20230807 +ARG ODOO_SHA=be9981c45465cdbd211406d91941d23786ec1e85 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 0b7bcd8ae..02a82169b 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230720 -ARG ODOO_SHA=5d5fb2e548734dcee584614d2385afc8f877eadc +ARG ODOO_RELEASE=20230807 +ARG ODOO_SHA=3d0566a191c0bd923846da38195d719c4779e727 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 3b63530bc..8152b3b6f 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -57,8 +57,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230720 -ARG ODOO_SHA=a8aa7b6dcd8722065d426526d06b76513fb0500e +ARG ODOO_RELEASE=20230807 +ARG ODOO_SHA=648042fc38a4f0021ad180e1bccbbe77a5c80c2c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 5a58ae093740b1d46bca77a09ec21907cbf25885 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 16 Aug 2023 15:53:53 +0200 Subject: [PATCH 127/208] [REF] Odoo 14.0-16.0: update to release 20230816 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index f07104751..5fe29efe7 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230807 -ARG ODOO_SHA=be9981c45465cdbd211406d91941d23786ec1e85 +ARG ODOO_RELEASE=20230816 +ARG ODOO_SHA=765652a730a334b94432b241c54823bd523ff7f4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 02a82169b..303f34e39 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230807 -ARG ODOO_SHA=3d0566a191c0bd923846da38195d719c4779e727 +ARG ODOO_RELEASE=20230816 +ARG ODOO_SHA=fd9d9025030be5e07ed90e3f471151e17a7ac9e0 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 8152b3b6f..3320fec2c 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -57,8 +57,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230807 -ARG ODOO_SHA=648042fc38a4f0021ad180e1bccbbe77a5c80c2c +ARG ODOO_RELEASE=20230816 +ARG ODOO_SHA=fc84b0d3fc0cb5506378c91f19681248c6fdb36e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 5a2479f0a2e1bdf387e520e8a7cc06b1148a7a74 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 25 Aug 2023 10:02:12 +0200 Subject: [PATCH 128/208] [REF] Odoo 14.0-16.0: update to release 20230825 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 5fe29efe7..16e37b926 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230816 -ARG ODOO_SHA=765652a730a334b94432b241c54823bd523ff7f4 +ARG ODOO_RELEASE=20230825 +ARG ODOO_SHA=b528e0a4b9e3924a04a76a50866412e8c000b0ef RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 303f34e39..11708f77c 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230816 -ARG ODOO_SHA=fd9d9025030be5e07ed90e3f471151e17a7ac9e0 +ARG ODOO_RELEASE=20230825 +ARG ODOO_SHA=29c8f49377b264ef1e9d1e12710ec530bcceeb06 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 3320fec2c..be3166337 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -57,8 +57,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230816 -ARG ODOO_SHA=fc84b0d3fc0cb5506378c91f19681248c6fdb36e +ARG ODOO_RELEASE=20230825 +ARG ODOO_SHA=12ce0c5d56051d71ec3d9d474b3f4694fdcae45a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 84abbabfd74959c2a6bde08a482a05418e2647e9 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 1 Sep 2023 15:38:26 +0200 Subject: [PATCH 129/208] [REF] Odoo 14.0-16.0: update to release 20230901 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 16e37b926..a1973fc89 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230825 -ARG ODOO_SHA=b528e0a4b9e3924a04a76a50866412e8c000b0ef +ARG ODOO_RELEASE=20230901 +ARG ODOO_SHA=0777c849049f346bb6f3f0eb7d544e9d2960d8d8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 11708f77c..6864ad5d5 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230825 -ARG ODOO_SHA=29c8f49377b264ef1e9d1e12710ec530bcceeb06 +ARG ODOO_RELEASE=20230901 +ARG ODOO_SHA=22553b2cb576c94801b6b1180c55e6d6d29de338 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index be3166337..75cdf6421 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -57,8 +57,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230825 -ARG ODOO_SHA=12ce0c5d56051d71ec3d9d474b3f4694fdcae45a +ARG ODOO_RELEASE=20230901 +ARG ODOO_SHA=2287a32457f8d26405b7203820c54dc112a4537d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 61148a86eed7fb5452dc7705b479988e1f49f9a6 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 8 Sep 2023 15:26:19 +0200 Subject: [PATCH 130/208] [REF] Odoo 14.0-16.0: update to release 20230908 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index a1973fc89..965d5ca37 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230901 -ARG ODOO_SHA=0777c849049f346bb6f3f0eb7d544e9d2960d8d8 +ARG ODOO_RELEASE=20230908 +ARG ODOO_SHA=2d87d3ad92af4643873995a0749b3b97cdeb7f73 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 6864ad5d5..2ecda419f 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230901 -ARG ODOO_SHA=22553b2cb576c94801b6b1180c55e6d6d29de338 +ARG ODOO_RELEASE=20230908 +ARG ODOO_SHA=ff9c3147d2f2056d1f510958e16fb15d5dc89b6e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 75cdf6421..f0f800081 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -57,8 +57,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230901 -ARG ODOO_SHA=2287a32457f8d26405b7203820c54dc112a4537d +ARG ODOO_RELEASE=20230908 +ARG ODOO_SHA=e8031569c375721ada05f12f4be4044f5d7bddbd RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From d04d885eea6b8f60ada727fcc498f5a8fd44da51 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 25 Sep 2023 08:46:28 +0200 Subject: [PATCH 131/208] [REF] Odoo 14.0-16.0: update to release 20230925 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 965d5ca37..42f1e4adc 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230908 -ARG ODOO_SHA=2d87d3ad92af4643873995a0749b3b97cdeb7f73 +ARG ODOO_RELEASE=20230925 +ARG ODOO_SHA=b7622d939c7135e693d498aec22a21638616bfee RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 2ecda419f..5ec82e719 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230908 -ARG ODOO_SHA=ff9c3147d2f2056d1f510958e16fb15d5dc89b6e +ARG ODOO_RELEASE=20230925 +ARG ODOO_SHA=e10abf8d0b57917d198d8185aa893fd44ce65c9c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index f0f800081..9b1381dcd 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -57,8 +57,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230908 -ARG ODOO_SHA=e8031569c375721ada05f12f4be4044f5d7bddbd +ARG ODOO_RELEASE=20230925 +ARG ODOO_SHA=c258ecd198cbd079fe1a271dcba23930820eb12f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From d98cfdf610867e4d01487913112f12722f3f0513 Mon Sep 17 00:00:00 2001 From: Ludovic Gasc Date: Wed, 26 Jul 2023 17:56:46 +0200 Subject: [PATCH 132/208] [REF] Odoo 16.0: Add support of ppc64le and arm64 --- 16.0/Dockerfile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 9b1381dcd..8407f690a 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -6,6 +6,9 @@ SHELL ["/bin/bash", "-xo", "pipefail", "-c"] # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 +# Retrieve the target architecture to install the correct wkhtmltopdf package +ARG TARGETARCH + # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf RUN apt-get update && \ apt-get install -y --no-install-recommends \ @@ -32,9 +35,15 @@ RUN apt-get update && \ python3-watchdog \ python3-xlrd \ python3-xlwt \ - xz-utils \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ - && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ + xz-utils && \ + WKHTMLTOPDF_ARCH=${TARGETARCH} && \ + case ${TARGETARCH} in \ + "amd64" | "") WKHTMLTOPDF_ARCH=amd64 && WKHTMLTOPDF_SHA=9df8dd7b1e99782f1cfa19aca665969bbd9cc159 ;; \ + "arm64") WKHTMLTOPDF_SHA=58c84db46b11ba0e14abb77a32324b1c257f1f22 ;; \ + "ppc64le") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=7ed8f6dcedf5345a3dd4eeb58dc89704d862f9cd ;; \ + esac \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bullseye_${WKHTMLTOPDF_ARCH}.deb \ + && echo ${WKHTMLTOPDF_SHA} wkhtmltox.deb | sha1sum -c - \ && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb From 8a93c61c028c306c32610cdef4cfcb606edd4ff0 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 24 Oct 2023 08:46:31 +0200 Subject: [PATCH 133/208] [REF] Odoo 14.0-16.0: update to release 20231024 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 42f1e4adc..b558c56e5 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230925 -ARG ODOO_SHA=b7622d939c7135e693d498aec22a21638616bfee +ARG ODOO_RELEASE=20231024 +ARG ODOO_SHA=18d30082b1e9a6d7f2e2d76e82737eaeb4ea3e26 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 5ec82e719..1fa3f9350 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230925 -ARG ODOO_SHA=e10abf8d0b57917d198d8185aa893fd44ce65c9c +ARG ODOO_RELEASE=20231024 +ARG ODOO_SHA=ce3f0b3b30e47c284e5769e5b5b4c1cd4562726f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 8407f690a..680d7658a 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -66,8 +66,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230925 -ARG ODOO_SHA=c258ecd198cbd079fe1a271dcba23930820eb12f +ARG ODOO_RELEASE=20231024 +ARG ODOO_SHA=8f81d6ff0fe4f9bc5a63cdeccb7006a7fc98f134 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 9b5e2cf27bcc23da4096c40b7369d0d43a4d90c6 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 26 Oct 2023 11:05:05 +0200 Subject: [PATCH 134/208] [FIX] Odoo 16.0: use dpkg to find build architecture As the docker-library doesn't use TARGETARCH yet, this commit set that variable by using `dpk --print-architecture` when the variable is not set. --- 16.0/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 680d7658a..1cbf51d54 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -36,9 +36,12 @@ RUN apt-get update && \ python3-xlrd \ python3-xlwt \ xz-utils && \ + if [ -z "${TARGETARCH}" ]; then \ + TARGETARCH="$(dpkg --print-architecture)"; \ + fi; \ WKHTMLTOPDF_ARCH=${TARGETARCH} && \ case ${TARGETARCH} in \ - "amd64" | "") WKHTMLTOPDF_ARCH=amd64 && WKHTMLTOPDF_SHA=9df8dd7b1e99782f1cfa19aca665969bbd9cc159 ;; \ + "amd64") WKHTMLTOPDF_ARCH=amd64 && WKHTMLTOPDF_SHA=9df8dd7b1e99782f1cfa19aca665969bbd9cc159 ;; \ "arm64") WKHTMLTOPDF_SHA=58c84db46b11ba0e14abb77a32324b1c257f1f22 ;; \ "ppc64le") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=7ed8f6dcedf5345a3dd4eeb58dc89704d862f9cd ;; \ esac \ From 9024ebefc33142ed70711986183007462e049fca Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 6 Nov 2023 15:04:57 +0100 Subject: [PATCH 135/208] [REF] Odoo 14.0-16.0: update to release 20231106 --- 14.0/Dockerfile | 4 ++-- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index b558c56e5..1522a0e5c 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20231024 -ARG ODOO_SHA=18d30082b1e9a6d7f2e2d76e82737eaeb4ea3e26 +ARG ODOO_RELEASE=20231106 +ARG ODOO_SHA=a50db3bf2d55c64bd51b6b56a2e3d0dbafc44894 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 1fa3f9350..9c048bc7b 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20231024 -ARG ODOO_SHA=ce3f0b3b30e47c284e5769e5b5b4c1cd4562726f +ARG ODOO_RELEASE=20231106 +ARG ODOO_SHA=5d0022d3a282f11c1b92c727ce93e69e732febfe RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 1cbf51d54..2d4f2a368 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20231024 -ARG ODOO_SHA=8f81d6ff0fe4f9bc5a63cdeccb7006a7fc98f134 +ARG ODOO_RELEASE=20231106 +ARG ODOO_SHA=ef0fa4f34bbb1af69733a8df1a19d2756de7916b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 3864188c94c33dace7d4b5f6767e00a4328fe08c Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 6 Nov 2023 15:16:33 +0100 Subject: [PATCH 136/208] [FIX] Odoo 16.0: handle goarch and dpkg arch output On ppc64le, the output of `dpkg --print-architecture` is `ppc64el`while the goarch value is `ppc64le`. So wkhtmltopdf would not be installed if the Dockerfile is built on a ppc64le without using the TARGETARCH arg. With this commit, this case is also handled. --- 16.0/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 2d4f2a368..db0812ff0 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -43,7 +43,7 @@ RUN apt-get update && \ case ${TARGETARCH} in \ "amd64") WKHTMLTOPDF_ARCH=amd64 && WKHTMLTOPDF_SHA=9df8dd7b1e99782f1cfa19aca665969bbd9cc159 ;; \ "arm64") WKHTMLTOPDF_SHA=58c84db46b11ba0e14abb77a32324b1c257f1f22 ;; \ - "ppc64le") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=7ed8f6dcedf5345a3dd4eeb58dc89704d862f9cd ;; \ + "ppc64le" | "ppc64el") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=7ed8f6dcedf5345a3dd4eeb58dc89704d862f9cd ;; \ esac \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bullseye_${WKHTMLTOPDF_ARCH}.deb \ && echo ${WKHTMLTOPDF_SHA} wkhtmltox.deb | sha1sum -c - \ From 0063771a0443142c3695d48e59cbfa677ad3a23d Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 10 Nov 2023 09:52:12 +0100 Subject: [PATCH 137/208] [REM] Odoo 14.0: remove deprecated version --- 14.0/Dockerfile | 88 ------------------------------------------- 14.0/entrypoint.sh | 49 ------------------------ 14.0/odoo.conf | 37 ------------------ 14.0/wait-for-psql.py | 32 ---------------- 4 files changed, 206 deletions(-) delete mode 100644 14.0/Dockerfile delete mode 100755 14.0/entrypoint.sh delete mode 100644 14.0/odoo.conf delete mode 100755 14.0/wait-for-psql.py diff --git a/14.0/Dockerfile b/14.0/Dockerfile deleted file mode 100644 index 1522a0e5c..000000000 --- a/14.0/Dockerfile +++ /dev/null @@ -1,88 +0,0 @@ -FROM debian:buster-slim -MAINTAINER Odoo S.A. - -SHELL ["/bin/bash", "-xo", "pipefail", "-c"] - -# Generate locale C.UTF-8 for postgres and general locale data -ENV LANG C.UTF-8 - -# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - dirmngr \ - fonts-noto-cjk \ - gnupg \ - libssl-dev \ - node-less \ - npm \ - python3-num2words \ - python3-pdfminer \ - python3-pip \ - python3-phonenumbers \ - python3-pyldap \ - python3-qrcode \ - python3-renderpm \ - python3-setuptools \ - python3-slugify \ - python3-vobject \ - python3-watchdog \ - python3-xlrd \ - python3-xlwt \ - xz-utils \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ - && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ - && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb - -# install latest postgresql-client -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ - && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && apt-get update \ - && apt-get install --no-install-recommends -y postgresql-client \ - && rm -f /etc/apt/sources.list.d/pgdg.list \ - && rm -rf /var/lib/apt/lists/* - -# Install rtlcss (on Debian buster) -RUN npm install -g rtlcss - -# Install Odoo -ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20231106 -ARG ODOO_SHA=a50db3bf2d55c64bd51b6b56a2e3d0dbafc44894 -RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ - && apt-get update \ - && apt-get -y install --no-install-recommends ./odoo.deb \ - && rm -rf /var/lib/apt/lists/* odoo.deb - -# Copy entrypoint script and Odoo configuration file -COPY ./entrypoint.sh / -COPY ./odoo.conf /etc/odoo/ - -# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons -RUN chown odoo /etc/odoo/odoo.conf \ - && mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons -VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] - -# Expose Odoo services -EXPOSE 8069 8071 8072 - -# Set the default config file -ENV ODOO_RC /etc/odoo/odoo.conf - -COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py - -# Set default user when running the container -USER odoo - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["odoo"] diff --git a/14.0/entrypoint.sh b/14.0/entrypoint.sh deleted file mode 100755 index f802bcb25..000000000 --- a/14.0/entrypoint.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -set -e - -if [ -v PASSWORD_FILE ]; then - PASSWORD="$(< $PASSWORD_FILE)" -fi - -# set the postgres database host, port, user and password according to the environment -# and pass them as arguments to the odoo process if not present in the config file -: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} -: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} -: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} - -DB_ARGS=() -function check_config() { - param="$1" - value="$2" - if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then - value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') - fi; - DB_ARGS+=("--${param}") - DB_ARGS+=("${value}") -} -check_config "db_host" "$HOST" -check_config "db_port" "$PORT" -check_config "db_user" "$USER" -check_config "db_password" "$PASSWORD" - -case "$1" in - -- | odoo) - shift - if [[ "$1" == "scaffold" ]] ; then - exec odoo "$@" - else - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - fi - ;; - -*) - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - ;; - *) - exec "$@" -esac - -exit 1 diff --git a/14.0/odoo.conf b/14.0/odoo.conf deleted file mode 100644 index 28f70c105..000000000 --- a/14.0/odoo.conf +++ /dev/null @@ -1,37 +0,0 @@ -[options] -addons_path = /mnt/extra-addons -data_dir = /var/lib/odoo -; admin_passwd = admin -; csv_internal_sep = , -; db_maxconn = 64 -; db_name = False -; db_template = template1 -; dbfilter = .* -; debug_mode = False -; email_from = False -; limit_memory_hard = 2684354560 -; limit_memory_soft = 2147483648 -; limit_request = 8192 -; limit_time_cpu = 60 -; limit_time_real = 120 -; list_db = True -; log_db = False -; log_handler = [':INFO'] -; log_level = info -; logfile = None -; longpolling_port = 8072 -; max_cron_threads = 2 -; osv_memory_age_limit = 1.0 -; osv_memory_count_limit = False -; smtp_password = False -; smtp_port = 25 -; smtp_server = localhost -; smtp_ssl = False -; smtp_user = False -; workers = 0 -; xmlrpc = True -; xmlrpc_interface = -; xmlrpc_port = 8069 -; xmlrpcs = True -; xmlrpcs_interface = -; xmlrpcs_port = 8071 diff --git a/14.0/wait-for-psql.py b/14.0/wait-for-psql.py deleted file mode 100755 index a55f44098..000000000 --- a/14.0/wait-for-psql.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import psycopg2 -import sys -import time - - -if __name__ == '__main__': - arg_parser = argparse.ArgumentParser() - arg_parser.add_argument('--db_host', required=True) - arg_parser.add_argument('--db_port', required=True) - arg_parser.add_argument('--db_user', required=True) - arg_parser.add_argument('--db_password', required=True) - arg_parser.add_argument('--timeout', type=int, default=5) - - args = arg_parser.parse_args() - - start_time = time.time() - while (time.time() - start_time) < args.timeout: - try: - conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') - error = '' - break - except psycopg2.OperationalError as e: - error = e - else: - conn.close() - time.sleep(1) - - if error: - print("Database connection failure: %s" % error, file=sys.stderr) - sys.exit(1) From 4ffdeb646fc407263b2f0dcba696fe3dd7251c53 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 13 Nov 2023 11:48:28 +0100 Subject: [PATCH 138/208] [REF] odoo 15.0-16.0: update to release 20231113 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 9c048bc7b..c9951ebc4 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20231106 -ARG ODOO_SHA=5d0022d3a282f11c1b92c727ce93e69e732febfe +ARG ODOO_RELEASE=20231113 +ARG ODOO_SHA=13ab7feaaa6f94269bfe4ff8922363ee7aac617c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index db0812ff0..68f0e62e1 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20231106 -ARG ODOO_SHA=ef0fa4f34bbb1af69733a8df1a19d2756de7916b +ARG ODOO_RELEASE=20231113 +ARG ODOO_SHA=32bcde397225f27f01874218e43d55e70bd61814 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 37a68eedff8ad776107bd51f0494514d4e4fb7be Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 13 Nov 2023 11:50:34 +0100 Subject: [PATCH 139/208] [ADD] Odoo: 17.0 --- 17.0/Dockerfile | 104 ++++++++++++++++++++++++++++++++++++++++++ 17.0/entrypoint.sh | 49 ++++++++++++++++++++ 17.0/odoo.conf | 37 +++++++++++++++ 17.0/wait-for-psql.py | 32 +++++++++++++ 4 files changed, 222 insertions(+) create mode 100644 17.0/Dockerfile create mode 100755 17.0/entrypoint.sh create mode 100644 17.0/odoo.conf create mode 100755 17.0/wait-for-psql.py diff --git a/17.0/Dockerfile b/17.0/Dockerfile new file mode 100644 index 000000000..8130e6667 --- /dev/null +++ b/17.0/Dockerfile @@ -0,0 +1,104 @@ +FROM ubuntu:jammy +MAINTAINER Odoo S.A. + +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + +# Generate locale C.UTF-8 for postgres and general locale data +ENV LANG en_US.UTF-8 + +# Retrieve the target architecture to install the correct wkhtmltopdf package +ARG TARGETARCH + +# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + dirmngr \ + fonts-noto-cjk \ + gnupg \ + libssl-dev \ + node-less \ + npm \ + python3-magic \ + python3-num2words \ + python3-odf \ + python3-pdfminer \ + python3-pip \ + python3-phonenumbers \ + python3-pyldap \ + python3-qrcode \ + python3-renderpm \ + python3-setuptools \ + python3-slugify \ + python3-vobject \ + python3-watchdog \ + python3-xlrd \ + python3-xlwt \ + xz-utils && \ + if [ -z "${TARGETARCH}" ]; then \ + TARGETARCH="$(dpkg --print-architecture)"; \ + fi; \ + WKHTMLTOPDF_ARCH=${TARGETARCH} && \ + case ${TARGETARCH} in \ + "amd64") WKHTMLTOPDF_ARCH=amd64 && WKHTMLTOPDF_SHA=967390a759707337b46d1c02452e2bb6b2dc6d59 ;; \ + "arm64") WKHTMLTOPDF_SHA=90f6e69896d51ef77339d3f3a20f8582bdf496cc ;; \ + "ppc64le" | "ppc64el") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=5312d7d34a25b321282929df82e3574319aed25c ;; \ + esac \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.jammy_${WKHTMLTOPDF_ARCH}.deb \ + && echo ${WKHTMLTOPDF_SHA} wkhtmltox.deb | sha1sum -c - \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb + +# install latest postgresql-client +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ + && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ + && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ + && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && apt-get update \ + && apt-get install --no-install-recommends -y postgresql-client \ + && rm -f /etc/apt/sources.list.d/pgdg.list \ + && rm -rf /var/lib/apt/lists/* + +# Install rtlcss (on Debian buster) +RUN npm install -g rtlcss + +# Install Odoo +ENV ODOO_VERSION 17.0 +ARG ODOO_RELEASE=20231113 +ARG ODOO_SHA=b72a32e3356084adb637334b45b110cdedc8ab0c +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ + && apt-get update \ + && apt-get -y install --no-install-recommends ./odoo.deb \ + && rm -rf /var/lib/apt/lists/* odoo.deb + +# Copy entrypoint script and Odoo configuration file +COPY ./entrypoint.sh / +COPY ./odoo.conf /etc/odoo/ + +# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons +RUN chown odoo /etc/odoo/odoo.conf \ + && mkdir -p /mnt/extra-addons \ + && chown -R odoo /mnt/extra-addons +VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] + +# Expose Odoo services +EXPOSE 8069 8071 8072 + +# Set the default config file +ENV ODOO_RC /etc/odoo/odoo.conf + +COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py + +# Set default user when running the container +USER odoo + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["odoo"] diff --git a/17.0/entrypoint.sh b/17.0/entrypoint.sh new file mode 100755 index 000000000..f802bcb25 --- /dev/null +++ b/17.0/entrypoint.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +set -e + +if [ -v PASSWORD_FILE ]; then + PASSWORD="$(< $PASSWORD_FILE)" +fi + +# set the postgres database host, port, user and password according to the environment +# and pass them as arguments to the odoo process if not present in the config file +: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} + +DB_ARGS=() +function check_config() { + param="$1" + value="$2" + if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then + value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') + fi; + DB_ARGS+=("--${param}") + DB_ARGS+=("${value}") +} +check_config "db_host" "$HOST" +check_config "db_port" "$PORT" +check_config "db_user" "$USER" +check_config "db_password" "$PASSWORD" + +case "$1" in + -- | odoo) + shift + if [[ "$1" == "scaffold" ]] ; then + exec odoo "$@" + else + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + fi + ;; + -*) + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + ;; + *) + exec "$@" +esac + +exit 1 diff --git a/17.0/odoo.conf b/17.0/odoo.conf new file mode 100644 index 000000000..28f70c105 --- /dev/null +++ b/17.0/odoo.conf @@ -0,0 +1,37 @@ +[options] +addons_path = /mnt/extra-addons +data_dir = /var/lib/odoo +; admin_passwd = admin +; csv_internal_sep = , +; db_maxconn = 64 +; db_name = False +; db_template = template1 +; dbfilter = .* +; debug_mode = False +; email_from = False +; limit_memory_hard = 2684354560 +; limit_memory_soft = 2147483648 +; limit_request = 8192 +; limit_time_cpu = 60 +; limit_time_real = 120 +; list_db = True +; log_db = False +; log_handler = [':INFO'] +; log_level = info +; logfile = None +; longpolling_port = 8072 +; max_cron_threads = 2 +; osv_memory_age_limit = 1.0 +; osv_memory_count_limit = False +; smtp_password = False +; smtp_port = 25 +; smtp_server = localhost +; smtp_ssl = False +; smtp_user = False +; workers = 0 +; xmlrpc = True +; xmlrpc_interface = +; xmlrpc_port = 8069 +; xmlrpcs = True +; xmlrpcs_interface = +; xmlrpcs_port = 8071 diff --git a/17.0/wait-for-psql.py b/17.0/wait-for-psql.py new file mode 100755 index 000000000..a55f44098 --- /dev/null +++ b/17.0/wait-for-psql.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 +import argparse +import psycopg2 +import sys +import time + + +if __name__ == '__main__': + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument('--db_host', required=True) + arg_parser.add_argument('--db_port', required=True) + arg_parser.add_argument('--db_user', required=True) + arg_parser.add_argument('--db_password', required=True) + arg_parser.add_argument('--timeout', type=int, default=5) + + args = arg_parser.parse_args() + + start_time = time.time() + while (time.time() - start_time) < args.timeout: + try: + conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') + error = '' + break + except psycopg2.OperationalError as e: + error = e + else: + conn.close() + time.sleep(1) + + if error: + print("Database connection failure: %s" % error, file=sys.stderr) + sys.exit(1) From d669144f88dba8e73071f16a093055f708fd3223 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 20 Nov 2023 13:30:33 +0100 Subject: [PATCH 140/208] [REF] Odoo 15.0-17.0: update to release 20231120 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index c9951ebc4..74830d95e 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20231113 -ARG ODOO_SHA=13ab7feaaa6f94269bfe4ff8922363ee7aac617c +ARG ODOO_RELEASE=20231120 +ARG ODOO_SHA=e9b17c526485b15053924eba01c7dca4d8db9653 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 68f0e62e1..07593c908 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20231113 -ARG ODOO_SHA=32bcde397225f27f01874218e43d55e70bd61814 +ARG ODOO_RELEASE=20231120 +ARG ODOO_SHA=97b5f7e7d545b4c8f29b133b01d64f6049c88c78 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 8130e6667..729ea4662 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20231113 -ARG ODOO_SHA=b72a32e3356084adb637334b45b110cdedc8ab0c +ARG ODOO_RELEASE=20231120 +ARG ODOO_SHA=57b836de2901c4ec5e3de433eb9258024701d255 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From c8eeb99e725564b92e623b191c7515d276cb6c3a Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 27 Nov 2023 10:08:19 +0100 Subject: [PATCH 141/208] [REF] Odoo 15.0-17.0: update to release 20231127 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 74830d95e..262d2890a 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20231120 -ARG ODOO_SHA=e9b17c526485b15053924eba01c7dca4d8db9653 +ARG ODOO_RELEASE=20231127 +ARG ODOO_SHA=c0e91e4d03ffa8a72db550389f33b7c3577fa829 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 07593c908..0949ef24a 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20231120 -ARG ODOO_SHA=97b5f7e7d545b4c8f29b133b01d64f6049c88c78 +ARG ODOO_RELEASE=20231127 +ARG ODOO_SHA=cf3fe2729f489476b5a07411a647667ed21e5208 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 729ea4662..ba8ba8908 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20231120 -ARG ODOO_SHA=57b836de2901c4ec5e3de433eb9258024701d255 +ARG ODOO_RELEASE=20231127 +ARG ODOO_SHA=b6953cecd2f06a24dc509cef277ffcd03f243a97 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 930f56df4052d0d7af0ccd5f2ca6b6096a8003fe Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 8 Dec 2023 14:34:09 +0100 Subject: [PATCH 142/208] [REF] Odoo 15.0-17.0: update to release 20231208 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 262d2890a..59c308524 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20231127 -ARG ODOO_SHA=c0e91e4d03ffa8a72db550389f33b7c3577fa829 +ARG ODOO_RELEASE=20231208 +ARG ODOO_SHA=ff20de27db7ead0a2fd690d4aa73ff9a47b0f09f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 0949ef24a..e3d229912 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20231127 -ARG ODOO_SHA=cf3fe2729f489476b5a07411a647667ed21e5208 +ARG ODOO_RELEASE=20231208 +ARG ODOO_SHA=468d34eb1d78003d832515f7f2bbc0cc90ab1cc0 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index ba8ba8908..7bff1a035 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20231127 -ARG ODOO_SHA=b6953cecd2f06a24dc509cef277ffcd03f243a97 +ARG ODOO_RELEASE=20231208 +ARG ODOO_SHA=22fee8e6b6f6e61236198eca5b01e2ebd223844d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 5b67879040592cb5d37969d0309f49355ece7d05 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 15 Dec 2023 10:40:22 +0100 Subject: [PATCH 143/208] [REF] Odoo 15.0-17.0: update to release 20231215 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 59c308524..e4546723b 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20231208 -ARG ODOO_SHA=ff20de27db7ead0a2fd690d4aa73ff9a47b0f09f +ARG ODOO_RELEASE=20231215 +ARG ODOO_SHA=a67e5a8be2d8b5c2da4f95614782ab4bcc0a17ec RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index e3d229912..c8627412d 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20231208 -ARG ODOO_SHA=468d34eb1d78003d832515f7f2bbc0cc90ab1cc0 +ARG ODOO_RELEASE=20231215 +ARG ODOO_SHA=dd439ff587a574a886855a9901d83d312214cdaf RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 7bff1a035..748627ff0 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20231208 -ARG ODOO_SHA=22fee8e6b6f6e61236198eca5b01e2ebd223844d +ARG ODOO_RELEASE=20231215 +ARG ODOO_SHA=e5073e19f71cbf056e2e647aa667d95b6f903901 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 24b54cae6708b2b13a8c92c9eb48f1465628f068 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 22 Dec 2023 14:28:18 +0100 Subject: [PATCH 144/208] [REF] Odoo 15.0-17.0: update to release 20231222 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index e4546723b..3efba7a9d 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20231215 -ARG ODOO_SHA=a67e5a8be2d8b5c2da4f95614782ab4bcc0a17ec +ARG ODOO_RELEASE=20231222 +ARG ODOO_SHA=475688179c3857aa76c46f86486d848812ba046b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index c8627412d..2678f11e6 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20231215 -ARG ODOO_SHA=dd439ff587a574a886855a9901d83d312214cdaf +ARG ODOO_RELEASE=20231222 +ARG ODOO_SHA=739d7dd119c00fa27ab1bcd140b70389ce271170 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 748627ff0..990a27050 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20231215 -ARG ODOO_SHA=e5073e19f71cbf056e2e647aa667d95b6f903901 +ARG ODOO_RELEASE=20231222 +ARG ODOO_SHA=77d67d4b3f66db72c0f5a63eae7ab32fea4774b2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From c6ef467e928725f597810d05743d6b354ab2e0ab Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 4 Jan 2024 09:45:28 +0100 Subject: [PATCH 145/208] [REF] Odoo 15.0-17.0: update to release 20240104 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 3efba7a9d..40e342c74 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20231222 -ARG ODOO_SHA=475688179c3857aa76c46f86486d848812ba046b +ARG ODOO_RELEASE=20240104 +ARG ODOO_SHA=af62378df9c727be6480f4cbc842fee621405f95 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 2678f11e6..621637acc 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20231222 -ARG ODOO_SHA=739d7dd119c00fa27ab1bcd140b70389ce271170 +ARG ODOO_RELEASE=20240104 +ARG ODOO_SHA=b404b131e0898bbd33849fb69dc97412219e64a3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 990a27050..7e7bbbfdb 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20231222 -ARG ODOO_SHA=77d67d4b3f66db72c0f5a63eae7ab32fea4774b2 +ARG ODOO_RELEASE=20240104 +ARG ODOO_SHA=d6f7e9309786857f820333698010903b1c621c5e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 45ad277d0e7eca984d0925d9acae655d0b90904d Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 15 Jan 2024 11:38:32 +0100 Subject: [PATCH 146/208] [REF] Odoo 15.0-17.0: update to release 20240115 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 40e342c74..b3840db23 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240104 -ARG ODOO_SHA=af62378df9c727be6480f4cbc842fee621405f95 +ARG ODOO_RELEASE=20240115 +ARG ODOO_SHA=40649ca80d22575f9a2714f1bc7a9f1e849b7523 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 621637acc..fb97b9204 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240104 -ARG ODOO_SHA=b404b131e0898bbd33849fb69dc97412219e64a3 +ARG ODOO_RELEASE=20240115 +ARG ODOO_SHA=9a0630da934549f3e514ae2b75c24351b99a2300 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 7e7bbbfdb..8791e8f3d 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240104 -ARG ODOO_SHA=d6f7e9309786857f820333698010903b1c621c5e +ARG ODOO_RELEASE=20240115 +ARG ODOO_SHA=9ef9520aee0080138de7abc67497648496619e43 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 218ae7120fa38ff511dbb569053109ad6deb4aea Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 26 Jan 2024 15:23:34 +0100 Subject: [PATCH 147/208] [REF] Odoo 15.0-17.0: update to release 20240126 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index b3840db23..6f225b028 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240115 -ARG ODOO_SHA=40649ca80d22575f9a2714f1bc7a9f1e849b7523 +ARG ODOO_RELEASE=20240126 +ARG ODOO_SHA=20f3c98fb543325181d2722aa531be9084142b3c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index fb97b9204..d6d78762b 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240115 -ARG ODOO_SHA=9a0630da934549f3e514ae2b75c24351b99a2300 +ARG ODOO_RELEASE=20240126 +ARG ODOO_SHA=7774e76d4044e675b9d1ca64832e6a581d90a9b6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 8791e8f3d..58c03968d 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240115 -ARG ODOO_SHA=9ef9520aee0080138de7abc67497648496619e43 +ARG ODOO_RELEASE=20240126 +ARG ODOO_SHA=b7af5d42448107e6efee183cf250e7365eb76e8a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From bcfe0ba461370cc14a98ac559c77a6767c2aaa1f Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 9 Feb 2024 15:51:45 +0100 Subject: [PATCH 148/208] [REF] Odoo 15.0-17.0: update to release 20240209 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 6f225b028..c3fd14b1b 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240126 -ARG ODOO_SHA=20f3c98fb543325181d2722aa531be9084142b3c +ARG ODOO_RELEASE=20240209 +ARG ODOO_SHA=22c94f752c7b0501711a74721d3f2e10f16ca410 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index d6d78762b..30480d74f 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240126 -ARG ODOO_SHA=7774e76d4044e675b9d1ca64832e6a581d90a9b6 +ARG ODOO_RELEASE=20240209 +ARG ODOO_SHA=69ba8f990effddcb2b9de0b3e9d5a53e98c868e3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 58c03968d..44ea61fe0 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240126 -ARG ODOO_SHA=b7af5d42448107e6efee183cf250e7365eb76e8a +ARG ODOO_RELEASE=20240209 +ARG ODOO_SHA=31a181b2ed0bcd303a955ea3716e59b2c3d2c20f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 35fea9ea1f6eadb32b009e503136b84a38d55e35 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 16 Feb 2024 10:25:49 +0100 Subject: [PATCH 149/208] [REF] Odoo 15.0-17.0: update to release 20240216 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index c3fd14b1b..51e6c7c06 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240209 -ARG ODOO_SHA=22c94f752c7b0501711a74721d3f2e10f16ca410 +ARG ODOO_RELEASE=20240216 +ARG ODOO_SHA=828692cbc07440e9734f7662ec74b1417b15d01d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 30480d74f..a19da6e0f 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240209 -ARG ODOO_SHA=69ba8f990effddcb2b9de0b3e9d5a53e98c868e3 +ARG ODOO_RELEASE=20240216 +ARG ODOO_SHA=550f2316a535d426556efc2fc2326a7063fa4cbe RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 44ea61fe0..aa21ef8a6 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240209 -ARG ODOO_SHA=31a181b2ed0bcd303a955ea3716e59b2c3d2c20f +ARG ODOO_RELEASE=20240216 +ARG ODOO_SHA=a7d92964cf77023326396e666973e284fe7a3a9c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 877f72dd0aaf70dbd19ef819b64c60afea715231 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 29 Feb 2024 10:31:40 +0100 Subject: [PATCH 150/208] [REF] Odoo 15.0-17.0: update to release 20240229 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 51e6c7c06..9a38d039f 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240216 -ARG ODOO_SHA=828692cbc07440e9734f7662ec74b1417b15d01d +ARG ODOO_RELEASE=20240229 +ARG ODOO_SHA=f99974a7dfc4862e348ef87e15766efcd2b777e2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index a19da6e0f..a12f11d7a 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240216 -ARG ODOO_SHA=550f2316a535d426556efc2fc2326a7063fa4cbe +ARG ODOO_RELEASE=20240229 +ARG ODOO_SHA=4434ed85784e13fa23cb09ed7168f0a430f73fd1 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index aa21ef8a6..f1e670bff 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240216 -ARG ODOO_SHA=a7d92964cf77023326396e666973e284fe7a3a9c +ARG ODOO_RELEASE=20240229 +ARG ODOO_SHA=e6baad4c22936a3913e51e4ddfd40b47c59fd9d4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From f2d27b791fdc53ee3a0c9575915d834540738c61 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 12 Mar 2024 09:02:14 +0100 Subject: [PATCH 151/208] [REF] Odoo 15.0-17.0: update to release 20240312 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 9a38d039f..261a473f5 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240229 -ARG ODOO_SHA=f99974a7dfc4862e348ef87e15766efcd2b777e2 +ARG ODOO_RELEASE=20240312 +ARG ODOO_SHA=8508bde605e961c6c823809cc162437424a01e76 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index a12f11d7a..30f1f5810 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240229 -ARG ODOO_SHA=4434ed85784e13fa23cb09ed7168f0a430f73fd1 +ARG ODOO_RELEASE=20240312 +ARG ODOO_SHA=900d911aecd734277f511c51e041ef92964ad55b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index f1e670bff..e2fa4c5ce 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240229 -ARG ODOO_SHA=e6baad4c22936a3913e51e4ddfd40b47c59fd9d4 +ARG ODOO_RELEASE=20240312 +ARG ODOO_SHA=467f514f90cf8cdc36dddd84129adefc4624be36 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 0daa6ed7704030a0f9840226f7e381e373476934 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 25 Mar 2024 11:29:10 +0100 Subject: [PATCH 152/208] [REF] Odoo 15.0-17.0: update to release 20240325 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 261a473f5..9c0192757 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240312 -ARG ODOO_SHA=8508bde605e961c6c823809cc162437424a01e76 +ARG ODOO_RELEASE=20240325 +ARG ODOO_SHA=9a4e3ff382fef0e15308aa124a42952fc0f8d254 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 30f1f5810..f39900e7a 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240312 -ARG ODOO_SHA=900d911aecd734277f511c51e041ef92964ad55b +ARG ODOO_RELEASE=20240325 +ARG ODOO_SHA=88872b9636eae21266c72c95c96d1fc20a9fa9c8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index e2fa4c5ce..444b47938 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240312 -ARG ODOO_SHA=467f514f90cf8cdc36dddd84129adefc4624be36 +ARG ODOO_RELEASE=20240325 +ARG ODOO_SHA=d137d4e0c5df0bee241a6078aa3ce0bf6953289e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 3f5fb1e41a006b19d21a8832ce0ec8974120c1cc Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 5 Apr 2024 10:10:08 +0200 Subject: [PATCH 153/208] [REF] Odoo 15.0-17.0: update to release 20240405 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 9c0192757..f724d162d 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240325 -ARG ODOO_SHA=9a4e3ff382fef0e15308aa124a42952fc0f8d254 +ARG ODOO_RELEASE=20240405 +ARG ODOO_SHA=2bb90b9cfad5e331027ffdf9b59d8d40c776ca1c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index f39900e7a..afe1292d8 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240325 -ARG ODOO_SHA=88872b9636eae21266c72c95c96d1fc20a9fa9c8 +ARG ODOO_RELEASE=20240405 +ARG ODOO_SHA=52b55e39027e72c5383746c893503df7db467524 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 444b47938..b590be6d3 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240325 -ARG ODOO_SHA=d137d4e0c5df0bee241a6078aa3ce0bf6953289e +ARG ODOO_RELEASE=20240405 +ARG ODOO_SHA=da9e09a429982d3b70ec0eef6c282b7a72eda47a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From ddcea34c2686e07cfb80ad1b42d9cd9c3b87f5a8 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 16 Apr 2024 14:49:53 +0200 Subject: [PATCH 154/208] [REF] Odoo 15.0-17.0: update to release 20240416 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index f724d162d..319d1b429 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240405 -ARG ODOO_SHA=2bb90b9cfad5e331027ffdf9b59d8d40c776ca1c +ARG ODOO_RELEASE=20240416 +ARG ODOO_SHA=9f48721922de9b671f233a979117757b1f2422fc RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index afe1292d8..7717ac952 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240405 -ARG ODOO_SHA=52b55e39027e72c5383746c893503df7db467524 +ARG ODOO_RELEASE=20240416 +ARG ODOO_SHA=d9418fee3ef105b40a58d89b8c7c500d34743ed5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index b590be6d3..980b6ee95 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240405 -ARG ODOO_SHA=da9e09a429982d3b70ec0eef6c282b7a72eda47a +ARG ODOO_RELEASE=20240416 +ARG ODOO_SHA=994057dc6db742f62b0666b8edf5cd1623df78d0 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 67e07c2791f2358d553765fb95f1baa779be09ec Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 29 Apr 2024 16:21:20 +0200 Subject: [PATCH 155/208] [REF] Odoo 15.0-17.0: update to release 20240429 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 319d1b429..3f7297a9e 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240416 -ARG ODOO_SHA=9f48721922de9b671f233a979117757b1f2422fc +ARG ODOO_RELEASE=20240429 +ARG ODOO_SHA=ded89a7635233e5bcd27869f777980bf5a637b24 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 7717ac952..c1646792a 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240416 -ARG ODOO_SHA=d9418fee3ef105b40a58d89b8c7c500d34743ed5 +ARG ODOO_RELEASE=20240429 +ARG ODOO_SHA=ab6ca8c472e544073731b645f37fe3ae6fe02aac RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 980b6ee95..e9abdc6ae 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240416 -ARG ODOO_SHA=994057dc6db742f62b0666b8edf5cd1623df78d0 +ARG ODOO_RELEASE=20240429 +ARG ODOO_SHA=12866ffdf469ce8e4639205bd74d59c211f37ed2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 28c9d0656e8d39f27dedf7ccccf243477626e807 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 13 May 2024 16:22:29 +0200 Subject: [PATCH 156/208] [REF] Odoo 15.0-17.0: update to release 20240513 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 3f7297a9e..031e12997 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240429 -ARG ODOO_SHA=ded89a7635233e5bcd27869f777980bf5a637b24 +ARG ODOO_RELEASE=20240513 +ARG ODOO_SHA=4404e4d34277a7d77918d1dcea67bc0fc98ba9fe RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index c1646792a..5d7d929e9 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240429 -ARG ODOO_SHA=ab6ca8c472e544073731b645f37fe3ae6fe02aac +ARG ODOO_RELEASE=20240513 +ARG ODOO_SHA=a1e0f0f72a7c09367bc0c09c4b75e801d15e11e6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index e9abdc6ae..77eb2c508 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240429 -ARG ODOO_SHA=12866ffdf469ce8e4639205bd74d59c211f37ed2 +ARG ODOO_RELEASE=20240513 +ARG ODOO_SHA=5ec8f5007ad564279fd06edfe90cf197711fcfd3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From ea74918b211215176bda85854a771be1c5c97871 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 22 May 2024 14:05:22 +0200 Subject: [PATCH 157/208] [REF] Odoo 15.0-17.0: update to release 20240522 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 031e12997..d92576b96 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240513 -ARG ODOO_SHA=4404e4d34277a7d77918d1dcea67bc0fc98ba9fe +ARG ODOO_RELEASE=20240522 +ARG ODOO_SHA=fee63fd1fae4b39df565744c3802bc09d65312d3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 5d7d929e9..6a8f0fca0 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240513 -ARG ODOO_SHA=a1e0f0f72a7c09367bc0c09c4b75e801d15e11e6 +ARG ODOO_RELEASE=20240522 +ARG ODOO_SHA=bcf783566f132d6391a2e2ee779ce082e904643d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 77eb2c508..0759c218a 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240513 -ARG ODOO_SHA=5ec8f5007ad564279fd06edfe90cf197711fcfd3 +ARG ODOO_RELEASE=20240522 +ARG ODOO_SHA=cc1b723a48b09ba80ee737dc10b4b08572811746 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 30416a3c40b5b3dbadd1d7d3c7e79f478fcbb74b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 3 Jun 2024 10:31:02 +0200 Subject: [PATCH 158/208] [REF] Odoo 15.0-17.0: update to release 20240603 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index d92576b96..ec6e10247 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240522 -ARG ODOO_SHA=fee63fd1fae4b39df565744c3802bc09d65312d3 +ARG ODOO_RELEASE=20240603 +ARG ODOO_SHA=1efdbbdfdb0af9defece942b02d5ffc7946f6bfc RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 6a8f0fca0..4b1a39dd4 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240522 -ARG ODOO_SHA=bcf783566f132d6391a2e2ee779ce082e904643d +ARG ODOO_RELEASE=20240603 +ARG ODOO_SHA=65abfbaad1715b42c627987cefceb1d63a9bf501 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 0759c218a..6b316b721 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240522 -ARG ODOO_SHA=cc1b723a48b09ba80ee737dc10b4b08572811746 +ARG ODOO_RELEASE=20240603 +ARG ODOO_SHA=abc6bbaa55dfecd2b6e00463db48ecac412db1fa RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From a25c36df57efc4fe900f04b97cef0e92d5f1a09f Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 24 Jun 2024 11:13:48 +0200 Subject: [PATCH 159/208] [REF] Odoo 15.0-17.0: update to release 20240624 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index ec6e10247..400891c71 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240603 -ARG ODOO_SHA=1efdbbdfdb0af9defece942b02d5ffc7946f6bfc +ARG ODOO_RELEASE=20240624 +ARG ODOO_SHA=34ce405377bf75beca3d4de1d81d1c89ba15fed9 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 4b1a39dd4..97e93a46d 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240603 -ARG ODOO_SHA=65abfbaad1715b42c627987cefceb1d63a9bf501 +ARG ODOO_RELEASE=20240624 +ARG ODOO_SHA=a51d6f097b24096d38959f4cd97ae5fb2cd2807b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 6b316b721..caa95b711 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240603 -ARG ODOO_SHA=abc6bbaa55dfecd2b6e00463db48ecac412db1fa +ARG ODOO_RELEASE=20240624 +ARG ODOO_SHA=76bba01e66368d00dc94c424f5f4964b8299f1b4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From c8297f5332271108e7e477afe8e8e17ca73afdd7 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 11 Jul 2024 11:17:21 +0200 Subject: [PATCH 160/208] [REF] Odoo 15.0-17.0: update to release 20240711 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 400891c71..2e553a324 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240624 -ARG ODOO_SHA=34ce405377bf75beca3d4de1d81d1c89ba15fed9 +ARG ODOO_RELEASE=20240711 +ARG ODOO_SHA=32aa2460ab3a2a539e3e99e791592db2ab2a8406 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 97e93a46d..6d90a0ac9 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240624 -ARG ODOO_SHA=a51d6f097b24096d38959f4cd97ae5fb2cd2807b +ARG ODOO_RELEASE=20240711 +ARG ODOO_SHA=0d16aea37be116a0fd07fc13c9c29a244737b419 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index caa95b711..641de2132 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240624 -ARG ODOO_SHA=76bba01e66368d00dc94c424f5f4964b8299f1b4 +ARG ODOO_RELEASE=20240711 +ARG ODOO_SHA=48a1ea9f9e6cf3d4913234c674cccd8c875a9aa4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 0a794bf1c202f1d7ca409ce30c159350dc541100 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 30 Jul 2024 14:28:55 +0200 Subject: [PATCH 161/208] [REF] Odoo 15.0-17.0: update to release 20240730 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 2e553a324..d4bb1c408 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240711 -ARG ODOO_SHA=32aa2460ab3a2a539e3e99e791592db2ab2a8406 +ARG ODOO_RELEASE=20240730 +ARG ODOO_SHA=dca04f296736763d040f26c653bc11ae5020ccc6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 6d90a0ac9..b3f430508 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240711 -ARG ODOO_SHA=0d16aea37be116a0fd07fc13c9c29a244737b419 +ARG ODOO_RELEASE=20240730 +ARG ODOO_SHA=05d42e6d53eb45df40abf82d3e60c42dead0ec05 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 641de2132..0fcb5cb4a 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240711 -ARG ODOO_SHA=48a1ea9f9e6cf3d4913234c674cccd8c875a9aa4 +ARG ODOO_RELEASE=20240730 +ARG ODOO_SHA=f798b05ba7975af1f11abfa6ecb5ef9b22cd712c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From b4cccf3ccae004aebfd334aa2639499496151598 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 9 Aug 2024 11:39:22 +0200 Subject: [PATCH 162/208] [REF] Odoo 15.0-17.0: update to release 20240809 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index d4bb1c408..7bd562935 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240730 -ARG ODOO_SHA=dca04f296736763d040f26c653bc11ae5020ccc6 +ARG ODOO_RELEASE=20240809 +ARG ODOO_SHA=885c9ba6d3b5ed81936002bb35b44bf2a94a5379 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index b3f430508..8ccbc451b 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240730 -ARG ODOO_SHA=05d42e6d53eb45df40abf82d3e60c42dead0ec05 +ARG ODOO_RELEASE=20240809 +ARG ODOO_SHA=e85b20bf653a7a1d5e5b5665e3fd5124c12e9ce1 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 0fcb5cb4a..ec4ccd967 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240730 -ARG ODOO_SHA=f798b05ba7975af1f11abfa6ecb5ef9b22cd712c +ARG ODOO_RELEASE=20240809 +ARG ODOO_SHA=c2487acec34fab9f9dbdd4beaa15c58db90d37be RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 801d34e4b41dbf16f81650b9e0c6fbbd302d5fb6 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 12 Aug 2024 13:24:22 +0200 Subject: [PATCH 163/208] [REF] Odoo 15.0-17.0: update to release 20240812 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 7bd562935..f1e485b61 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240809 -ARG ODOO_SHA=885c9ba6d3b5ed81936002bb35b44bf2a94a5379 +ARG ODOO_RELEASE=20240812 +ARG ODOO_SHA=e7a94dd172521969648670f3995d7c8c3f32941c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 8ccbc451b..6bc89591c 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240809 -ARG ODOO_SHA=e85b20bf653a7a1d5e5b5665e3fd5124c12e9ce1 +ARG ODOO_RELEASE=20240812 +ARG ODOO_SHA=4dd27a13b50e32011048d75444bc31a022c67618 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index ec4ccd967..8d143ff39 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240809 -ARG ODOO_SHA=c2487acec34fab9f9dbdd4beaa15c58db90d37be +ARG ODOO_RELEASE=20240812 +ARG ODOO_SHA=f42fe6e80daa50d3198987e9d76373cfa6e4396c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 0c03225b389719665ea92daa79af4d5bcc4c9794 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 19 Aug 2024 08:45:14 +0200 Subject: [PATCH 164/208] [REF] Odoo 15.0-17.0: update to release 20240819 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index f1e485b61..2d5ace5c7 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240812 -ARG ODOO_SHA=e7a94dd172521969648670f3995d7c8c3f32941c +ARG ODOO_RELEASE=20240819 +ARG ODOO_SHA=5934248e8cac9b5dc28829da5ac46dcaeceb7714 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 6bc89591c..72306a389 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240812 -ARG ODOO_SHA=4dd27a13b50e32011048d75444bc31a022c67618 +ARG ODOO_RELEASE=20240819 +ARG ODOO_SHA=3b24f0d4cd39879d60bee66331091e202fa2675b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 8d143ff39..10b3c3a3a 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240812 -ARG ODOO_SHA=f42fe6e80daa50d3198987e9d76373cfa6e4396c +ARG ODOO_RELEASE=20240819 +ARG ODOO_SHA=81689a80a074843ada7c712ba23cde1cfca9b63c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From b6411dfc5391faaa18a0e12951adcbc3469c2a30 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 26 Aug 2024 10:31:43 +0200 Subject: [PATCH 165/208] [REF] Odoo 15.0-17.0: update to release 20240826 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 2d5ace5c7..c836e7ad0 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240819 -ARG ODOO_SHA=5934248e8cac9b5dc28829da5ac46dcaeceb7714 +ARG ODOO_RELEASE=20240826 +ARG ODOO_SHA=8619048c1cc90d5e388d93a6d4a63f4d4d05ee82 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 72306a389..8a8ae24e9 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240819 -ARG ODOO_SHA=3b24f0d4cd39879d60bee66331091e202fa2675b +ARG ODOO_RELEASE=20240826 +ARG ODOO_SHA=4c360e9de7eee5401ea217e3a451d301d7547029 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 10b3c3a3a..e558c0a01 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240819 -ARG ODOO_SHA=81689a80a074843ada7c712ba23cde1cfca9b63c +ARG ODOO_RELEASE=20240826 +ARG ODOO_SHA=7f40f642e89d8ecd43d748c23dc4251fcdca84ca RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From e0227fd3dce1da5abcd698f3fd805324c351d7c1 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 4 Sep 2024 11:14:36 +0200 Subject: [PATCH 166/208] [REF] Odoo 15.0-17.0: update to release 20240904 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index c836e7ad0..c19771a0f 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240826 -ARG ODOO_SHA=8619048c1cc90d5e388d93a6d4a63f4d4d05ee82 +ARG ODOO_RELEASE=20240904 +ARG ODOO_SHA=2ce168169e2b949b155526c0f1f89b1df6c18a26 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 8a8ae24e9..f9f95b8e6 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240826 -ARG ODOO_SHA=4c360e9de7eee5401ea217e3a451d301d7547029 +ARG ODOO_RELEASE=20240904 +ARG ODOO_SHA=9ff4c6b6b51287a202289ab6038fa506729042aa RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index e558c0a01..f43600059 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240826 -ARG ODOO_SHA=7f40f642e89d8ecd43d748c23dc4251fcdca84ca +ARG ODOO_RELEASE=20240904 +ARG ODOO_SHA=9fd807d55facb850ead1ad86dc628e26961dfb20 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 36079c9de840d5682f32b7163892dfdc8138db2b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 12 Sep 2024 11:27:03 +0200 Subject: [PATCH 167/208] [REF] Odoo 15.0-17.0: update to release 20240912 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index c19771a0f..e1ce62b22 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240904 -ARG ODOO_SHA=2ce168169e2b949b155526c0f1f89b1df6c18a26 +ARG ODOO_RELEASE=20240912 +ARG ODOO_SHA=a2a8947448c8c561336f9b2710eeb9e9cbfdec66 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index f9f95b8e6..91bd0743b 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240904 -ARG ODOO_SHA=9ff4c6b6b51287a202289ab6038fa506729042aa +ARG ODOO_RELEASE=20240912 +ARG ODOO_SHA=52fe9258f56d41d29851e2fd6a329effb741dae7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index f43600059..85e9793bb 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240904 -ARG ODOO_SHA=9fd807d55facb850ead1ad86dc628e26961dfb20 +ARG ODOO_RELEASE=20240912 +ARG ODOO_SHA=4456afb92e3235660c711160b1f457d31902c391 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 5fb6a842747c296099d9384587cd89640eb7a615 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 24 Sep 2024 09:24:50 +0200 Subject: [PATCH 168/208] [REF] Odoo 15.0-17.0: update to release 20240924 --- 15.0/Dockerfile | 4 ++-- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index e1ce62b22..42442f1d6 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,8 +55,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240912 -ARG ODOO_SHA=a2a8947448c8c561336f9b2710eeb9e9cbfdec66 +ARG ODOO_RELEASE=20240924 +ARG ODOO_SHA=aff60a8a895d6b5f3cca83ac3832eccf3e40d820 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 91bd0743b..2e50be3d3 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240912 -ARG ODOO_SHA=52fe9258f56d41d29851e2fd6a329effb741dae7 +ARG ODOO_RELEASE=20240924 +ARG ODOO_SHA=1fb02a432e076dd71aca7a7611a07223919356b9 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 85e9793bb..e5eef516a 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240912 -ARG ODOO_SHA=4456afb92e3235660c711160b1f457d31902c391 +ARG ODOO_RELEASE=20240924 +ARG ODOO_SHA=f1b567f442ff645793235cdfaba5be9204ee8b55 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 190cdb6c0f69759d5b6809c895bcbb314fd92319 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 7 Oct 2024 09:24:32 +0200 Subject: [PATCH 169/208] [REM] Odoo 15.0: remove deprecated version --- 15.0/Dockerfile | 88 ------------------------------------------- 15.0/entrypoint.sh | 49 ------------------------ 15.0/odoo.conf | 37 ------------------ 15.0/wait-for-psql.py | 32 ---------------- 4 files changed, 206 deletions(-) delete mode 100644 15.0/Dockerfile delete mode 100755 15.0/entrypoint.sh delete mode 100644 15.0/odoo.conf delete mode 100755 15.0/wait-for-psql.py diff --git a/15.0/Dockerfile b/15.0/Dockerfile deleted file mode 100644 index 42442f1d6..000000000 --- a/15.0/Dockerfile +++ /dev/null @@ -1,88 +0,0 @@ -FROM debian:bullseye-slim -MAINTAINER Odoo S.A. - -SHELL ["/bin/bash", "-xo", "pipefail", "-c"] - -# Generate locale C.UTF-8 for postgres and general locale data -ENV LANG C.UTF-8 - -# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - dirmngr \ - fonts-noto-cjk \ - gnupg \ - libssl-dev \ - node-less \ - npm \ - python3-num2words \ - python3-pdfminer \ - python3-pip \ - python3-phonenumbers \ - python3-pyldap \ - python3-qrcode \ - python3-renderpm \ - python3-setuptools \ - python3-slugify \ - python3-vobject \ - python3-watchdog \ - python3-xlrd \ - python3-xlwt \ - xz-utils \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ - && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ - && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb - -# install latest postgresql-client -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ - && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && apt-get update \ - && apt-get install --no-install-recommends -y postgresql-client \ - && rm -f /etc/apt/sources.list.d/pgdg.list \ - && rm -rf /var/lib/apt/lists/* - -# Install rtlcss (on Debian buster) -RUN npm install -g rtlcss - -# Install Odoo -ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20240924 -ARG ODOO_SHA=aff60a8a895d6b5f3cca83ac3832eccf3e40d820 -RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ - && apt-get update \ - && apt-get -y install --no-install-recommends ./odoo.deb \ - && rm -rf /var/lib/apt/lists/* odoo.deb - -# Copy entrypoint script and Odoo configuration file -COPY ./entrypoint.sh / -COPY ./odoo.conf /etc/odoo/ - -# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons -RUN chown odoo /etc/odoo/odoo.conf \ - && mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons -VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] - -# Expose Odoo services -EXPOSE 8069 8071 8072 - -# Set the default config file -ENV ODOO_RC /etc/odoo/odoo.conf - -COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py - -# Set default user when running the container -USER odoo - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["odoo"] diff --git a/15.0/entrypoint.sh b/15.0/entrypoint.sh deleted file mode 100755 index f802bcb25..000000000 --- a/15.0/entrypoint.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -set -e - -if [ -v PASSWORD_FILE ]; then - PASSWORD="$(< $PASSWORD_FILE)" -fi - -# set the postgres database host, port, user and password according to the environment -# and pass them as arguments to the odoo process if not present in the config file -: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} -: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} -: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} - -DB_ARGS=() -function check_config() { - param="$1" - value="$2" - if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then - value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') - fi; - DB_ARGS+=("--${param}") - DB_ARGS+=("${value}") -} -check_config "db_host" "$HOST" -check_config "db_port" "$PORT" -check_config "db_user" "$USER" -check_config "db_password" "$PASSWORD" - -case "$1" in - -- | odoo) - shift - if [[ "$1" == "scaffold" ]] ; then - exec odoo "$@" - else - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - fi - ;; - -*) - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - ;; - *) - exec "$@" -esac - -exit 1 diff --git a/15.0/odoo.conf b/15.0/odoo.conf deleted file mode 100644 index 28f70c105..000000000 --- a/15.0/odoo.conf +++ /dev/null @@ -1,37 +0,0 @@ -[options] -addons_path = /mnt/extra-addons -data_dir = /var/lib/odoo -; admin_passwd = admin -; csv_internal_sep = , -; db_maxconn = 64 -; db_name = False -; db_template = template1 -; dbfilter = .* -; debug_mode = False -; email_from = False -; limit_memory_hard = 2684354560 -; limit_memory_soft = 2147483648 -; limit_request = 8192 -; limit_time_cpu = 60 -; limit_time_real = 120 -; list_db = True -; log_db = False -; log_handler = [':INFO'] -; log_level = info -; logfile = None -; longpolling_port = 8072 -; max_cron_threads = 2 -; osv_memory_age_limit = 1.0 -; osv_memory_count_limit = False -; smtp_password = False -; smtp_port = 25 -; smtp_server = localhost -; smtp_ssl = False -; smtp_user = False -; workers = 0 -; xmlrpc = True -; xmlrpc_interface = -; xmlrpc_port = 8069 -; xmlrpcs = True -; xmlrpcs_interface = -; xmlrpcs_port = 8071 diff --git a/15.0/wait-for-psql.py b/15.0/wait-for-psql.py deleted file mode 100755 index a55f44098..000000000 --- a/15.0/wait-for-psql.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import psycopg2 -import sys -import time - - -if __name__ == '__main__': - arg_parser = argparse.ArgumentParser() - arg_parser.add_argument('--db_host', required=True) - arg_parser.add_argument('--db_port', required=True) - arg_parser.add_argument('--db_user', required=True) - arg_parser.add_argument('--db_password', required=True) - arg_parser.add_argument('--timeout', type=int, default=5) - - args = arg_parser.parse_args() - - start_time = time.time() - while (time.time() - start_time) < args.timeout: - try: - conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') - error = '' - break - except psycopg2.OperationalError as e: - error = e - else: - conn.close() - time.sleep(1) - - if error: - print("Database connection failure: %s" % error, file=sys.stderr) - sys.exit(1) From 9072f9d992ab9fd01fcc06b7099de8250d53e53b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 7 Oct 2024 09:26:06 +0200 Subject: [PATCH 170/208] [REF] Odoo 16.0-17.0: update to release 20241007 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 2e50be3d3..9e13aa1c0 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20240924 -ARG ODOO_SHA=1fb02a432e076dd71aca7a7611a07223919356b9 +ARG ODOO_RELEASE=20241007 +ARG ODOO_SHA=6fb4b7e5bbbc88991511c7ae1121c92625b99649 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index e5eef516a..6ec8e572c 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20240924 -ARG ODOO_SHA=f1b567f442ff645793235cdfaba5be9204ee8b55 +ARG ODOO_RELEASE=20241007 +ARG ODOO_SHA=4fa14c442f44693556bba99eb4a6b90c13be9b7d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 282f5a3761223344e610dfe889f737d75039531d Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 7 Oct 2024 09:26:58 +0200 Subject: [PATCH 171/208] [ADD] Odoo: 18.0 --- 18.0/Dockerfile | 104 ++++++++++++++++++++++++++++++++++++++++++ 18.0/entrypoint.sh | 49 ++++++++++++++++++++ 18.0/odoo.conf | 37 +++++++++++++++ 18.0/wait-for-psql.py | 32 +++++++++++++ 4 files changed, 222 insertions(+) create mode 100644 18.0/Dockerfile create mode 100755 18.0/entrypoint.sh create mode 100644 18.0/odoo.conf create mode 100755 18.0/wait-for-psql.py diff --git a/18.0/Dockerfile b/18.0/Dockerfile new file mode 100644 index 000000000..1afa58e3f --- /dev/null +++ b/18.0/Dockerfile @@ -0,0 +1,104 @@ +FROM ubuntu:noble +MAINTAINER Odoo S.A. + +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + +# Generate locale C.UTF-8 for postgres and general locale data +ENV LANG en_US.UTF-8 + +# Retrieve the target architecture to install the correct wkhtmltopdf package +ARG TARGETARCH + +# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + dirmngr \ + fonts-noto-cjk \ + gnupg \ + libssl-dev \ + node-less \ + npm \ + python3-magic \ + python3-num2words \ + python3-odf \ + python3-pdfminer \ + python3-pip \ + python3-phonenumbers \ + python3-pyldap \ + python3-qrcode \ + python3-renderpm \ + python3-setuptools \ + python3-slugify \ + python3-vobject \ + python3-watchdog \ + python3-xlrd \ + python3-xlwt \ + xz-utils && \ + if [ -z "${TARGETARCH}" ]; then \ + TARGETARCH="$(dpkg --print-architecture)"; \ + fi; \ + WKHTMLTOPDF_ARCH=${TARGETARCH} && \ + case ${TARGETARCH} in \ + "amd64") WKHTMLTOPDF_ARCH=amd64 && WKHTMLTOPDF_SHA=967390a759707337b46d1c02452e2bb6b2dc6d59 ;; \ + "arm64") WKHTMLTOPDF_SHA=90f6e69896d51ef77339d3f3a20f8582bdf496cc ;; \ + "ppc64le" | "ppc64el") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=5312d7d34a25b321282929df82e3574319aed25c ;; \ + esac \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.jammy_${WKHTMLTOPDF_ARCH}.deb \ + && echo ${WKHTMLTOPDF_SHA} wkhtmltox.deb | sha1sum -c - \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb + +# install latest postgresql-client +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ + && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ + && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ + && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && apt-get update \ + && apt-get install --no-install-recommends -y postgresql-client \ + && rm -f /etc/apt/sources.list.d/pgdg.list \ + && rm -rf /var/lib/apt/lists/* + +# Install rtlcss (on Debian buster) +RUN npm install -g rtlcss + +# Install Odoo +ENV ODOO_VERSION 18.0 +ARG ODOO_RELEASE=20241007 +ARG ODOO_SHA=d96c137e1dc0a60a78767a3a959be49d9ba615c1 +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ + && apt-get update \ + && apt-get -y install --no-install-recommends ./odoo.deb \ + && rm -rf /var/lib/apt/lists/* odoo.deb + +# Copy entrypoint script and Odoo configuration file +COPY ./entrypoint.sh / +COPY ./odoo.conf /etc/odoo/ + +# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons +RUN chown odoo /etc/odoo/odoo.conf \ + && mkdir -p /mnt/extra-addons \ + && chown -R odoo /mnt/extra-addons +VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] + +# Expose Odoo services +EXPOSE 8069 8071 8072 + +# Set the default config file +ENV ODOO_RC /etc/odoo/odoo.conf + +COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py + +# Set default user when running the container +USER odoo + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["odoo"] diff --git a/18.0/entrypoint.sh b/18.0/entrypoint.sh new file mode 100755 index 000000000..f802bcb25 --- /dev/null +++ b/18.0/entrypoint.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +set -e + +if [ -v PASSWORD_FILE ]; then + PASSWORD="$(< $PASSWORD_FILE)" +fi + +# set the postgres database host, port, user and password according to the environment +# and pass them as arguments to the odoo process if not present in the config file +: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} + +DB_ARGS=() +function check_config() { + param="$1" + value="$2" + if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then + value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') + fi; + DB_ARGS+=("--${param}") + DB_ARGS+=("${value}") +} +check_config "db_host" "$HOST" +check_config "db_port" "$PORT" +check_config "db_user" "$USER" +check_config "db_password" "$PASSWORD" + +case "$1" in + -- | odoo) + shift + if [[ "$1" == "scaffold" ]] ; then + exec odoo "$@" + else + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + fi + ;; + -*) + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + ;; + *) + exec "$@" +esac + +exit 1 diff --git a/18.0/odoo.conf b/18.0/odoo.conf new file mode 100644 index 000000000..28f70c105 --- /dev/null +++ b/18.0/odoo.conf @@ -0,0 +1,37 @@ +[options] +addons_path = /mnt/extra-addons +data_dir = /var/lib/odoo +; admin_passwd = admin +; csv_internal_sep = , +; db_maxconn = 64 +; db_name = False +; db_template = template1 +; dbfilter = .* +; debug_mode = False +; email_from = False +; limit_memory_hard = 2684354560 +; limit_memory_soft = 2147483648 +; limit_request = 8192 +; limit_time_cpu = 60 +; limit_time_real = 120 +; list_db = True +; log_db = False +; log_handler = [':INFO'] +; log_level = info +; logfile = None +; longpolling_port = 8072 +; max_cron_threads = 2 +; osv_memory_age_limit = 1.0 +; osv_memory_count_limit = False +; smtp_password = False +; smtp_port = 25 +; smtp_server = localhost +; smtp_ssl = False +; smtp_user = False +; workers = 0 +; xmlrpc = True +; xmlrpc_interface = +; xmlrpc_port = 8069 +; xmlrpcs = True +; xmlrpcs_interface = +; xmlrpcs_port = 8071 diff --git a/18.0/wait-for-psql.py b/18.0/wait-for-psql.py new file mode 100755 index 000000000..a55f44098 --- /dev/null +++ b/18.0/wait-for-psql.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 +import argparse +import psycopg2 +import sys +import time + + +if __name__ == '__main__': + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument('--db_host', required=True) + arg_parser.add_argument('--db_port', required=True) + arg_parser.add_argument('--db_user', required=True) + arg_parser.add_argument('--db_password', required=True) + arg_parser.add_argument('--timeout', type=int, default=5) + + args = arg_parser.parse_args() + + start_time = time.time() + while (time.time() - start_time) < args.timeout: + try: + conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') + error = '' + break + except psycopg2.OperationalError as e: + error = e + else: + conn.close() + time.sleep(1) + + if error: + print("Database connection failure: %s" % error, file=sys.stderr) + sys.exit(1) From decdaff7f94fd13001ac5dbdba59776b628265eb Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 17 Oct 2024 15:36:11 +0200 Subject: [PATCH 172/208] [REF] Odoo 16.0-18.0: update to release 20241017 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 9e13aa1c0..ba08ac06e 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20241007 -ARG ODOO_SHA=6fb4b7e5bbbc88991511c7ae1121c92625b99649 +ARG ODOO_RELEASE=20241017 +ARG ODOO_SHA=7223ab5d65a42a6d189cdfb5397716a51ef512f9 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 6ec8e572c..3ab4ed15c 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20241007 -ARG ODOO_SHA=4fa14c442f44693556bba99eb4a6b90c13be9b7d +ARG ODOO_RELEASE=20241017 +ARG ODOO_SHA=e5d7e6c6d011698cb6589e2a9b717caaac69df35 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 1afa58e3f..63776c299 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20241007 -ARG ODOO_SHA=d96c137e1dc0a60a78767a3a959be49d9ba615c1 +ARG ODOO_RELEASE=20241017 +ARG ODOO_SHA=dc1c1e8bb1323fd32ce1bd830bb1d6c6d93098c7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From acacd14c9ce469c234b6fc2f10ab8dd254b2f706 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 29 Oct 2024 14:56:14 +0100 Subject: [PATCH 173/208] [REF] Odoo 16.0-18.0: update to release 20241029 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index ba08ac06e..edf878a23 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20241017 -ARG ODOO_SHA=7223ab5d65a42a6d189cdfb5397716a51ef512f9 +ARG ODOO_RELEASE=20241029 +ARG ODOO_SHA=ac6b44b70f9b52d47818aa422c7e4d02cba9b05d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 3ab4ed15c..022e88ce0 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20241017 -ARG ODOO_SHA=e5d7e6c6d011698cb6589e2a9b717caaac69df35 +ARG ODOO_RELEASE=20241029 +ARG ODOO_SHA=200c2bacf48dbb794c8fd55750a1adb0b59e32e0 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 63776c299..ac8ccfaca 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20241017 -ARG ODOO_SHA=dc1c1e8bb1323fd32ce1bd830bb1d6c6d93098c7 +ARG ODOO_RELEASE=20241029 +ARG ODOO_SHA=6bb4a15aa9304ea8642940b232227b1a3e9ac266 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 5d79fb3b294227a6264fab1b68917bd344f0c517 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 8 Nov 2024 11:31:04 +0100 Subject: [PATCH 174/208] [REF] Odoo 16.0-18.0: update to release 20241108 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index edf878a23..ba5db99a0 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20241029 -ARG ODOO_SHA=ac6b44b70f9b52d47818aa422c7e4d02cba9b05d +ARG ODOO_RELEASE=20241108 +ARG ODOO_SHA=0ac65f3a2ec8787626c4e472694461e31ae109d5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 022e88ce0..fe5903cad 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20241029 -ARG ODOO_SHA=200c2bacf48dbb794c8fd55750a1adb0b59e32e0 +ARG ODOO_RELEASE=20241108 +ARG ODOO_SHA=b49bcf72c9e57e444483c84323fbd2fe878f7651 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index ac8ccfaca..afd32b024 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20241029 -ARG ODOO_SHA=6bb4a15aa9304ea8642940b232227b1a3e9ac266 +ARG ODOO_RELEASE=20241108 +ARG ODOO_SHA=919f386aa25f0a10d537f09c945349b20c502f73 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 593824b6735d46a7be744006e98f8f53d50cc5db Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 18 Nov 2024 10:26:19 +0100 Subject: [PATCH 175/208] [REF] Odoo 16.0-18.0: update to release 20241118 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index ba5db99a0..c6e57c791 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20241108 -ARG ODOO_SHA=0ac65f3a2ec8787626c4e472694461e31ae109d5 +ARG ODOO_RELEASE=20241118 +ARG ODOO_SHA=105ceca6241c08e989d505eafc29307cb5c47eb1 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index fe5903cad..32620d74d 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20241108 -ARG ODOO_SHA=b49bcf72c9e57e444483c84323fbd2fe878f7651 +ARG ODOO_RELEASE=20241118 +ARG ODOO_SHA=dfe488ab08285c524b7ee4ea7fa3108e23fd3cc6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index afd32b024..e17f859a4 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20241108 -ARG ODOO_SHA=919f386aa25f0a10d537f09c945349b20c502f73 +ARG ODOO_RELEASE=20241118 +ARG ODOO_SHA=1b907c8c28df9e8e1ef0593b995e8c3408c65c43 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 5c9e504bfbf35c2e086bfb6057d7003d8a2dca1c Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 25 Nov 2024 10:49:34 +0100 Subject: [PATCH 176/208] [REF] Odoo 16.0-18.0: update to release 20241125 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index c6e57c791..659d32aee 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20241118 -ARG ODOO_SHA=105ceca6241c08e989d505eafc29307cb5c47eb1 +ARG ODOO_RELEASE=20241125 +ARG ODOO_SHA=3bf9f45278efc7ae579b581543686fe75893699a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 32620d74d..68bb723a1 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20241118 -ARG ODOO_SHA=dfe488ab08285c524b7ee4ea7fa3108e23fd3cc6 +ARG ODOO_RELEASE=20241125 +ARG ODOO_SHA=10482830e9ce1d9850e9b8fd335875fa034a44a9 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index e17f859a4..14115aadd 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20241118 -ARG ODOO_SHA=1b907c8c28df9e8e1ef0593b995e8c3408c65c43 +ARG ODOO_RELEASE=20241125 +ARG ODOO_SHA=855fddc45b4c9bc2e2a832d275f8168918ffe08b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From beb0b7ff250178aaafce2b2adffd7f45d881fbaf Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 9 Dec 2024 12:09:29 +0100 Subject: [PATCH 177/208] [REF] Odoo 16.0-18.0: update to release 20241209 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 659d32aee..4dae093f8 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20241125 -ARG ODOO_SHA=3bf9f45278efc7ae579b581543686fe75893699a +ARG ODOO_RELEASE=20241209 +ARG ODOO_SHA=cec2ddcce6dd38867b6983dbe68b2c43b030cd12 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 68bb723a1..8d60bef4c 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20241125 -ARG ODOO_SHA=10482830e9ce1d9850e9b8fd335875fa034a44a9 +ARG ODOO_RELEASE=20241209 +ARG ODOO_SHA=001b05df41497bd08b49c9c44ad489026f4c4542 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 14115aadd..0e2f21965 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20241125 -ARG ODOO_SHA=855fddc45b4c9bc2e2a832d275f8168918ffe08b +ARG ODOO_RELEASE=20241209 +ARG ODOO_SHA=e770c1c522d51a81e1b635babd9be08df17fa604 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 6b739618081fc0ff46032b38f5c126bafcdfe3a4 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 20 Dec 2024 15:50:55 +0100 Subject: [PATCH 178/208] [REF] Odoo 16.0-18.0: update to release 20241220 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 4dae093f8..b39d38c79 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20241209 -ARG ODOO_SHA=cec2ddcce6dd38867b6983dbe68b2c43b030cd12 +ARG ODOO_RELEASE=20241220 +ARG ODOO_SHA=6312a02426f8b8c8b7578947cd8733e8f042de54 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 8d60bef4c..84eb1e0a3 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20241209 -ARG ODOO_SHA=001b05df41497bd08b49c9c44ad489026f4c4542 +ARG ODOO_RELEASE=20241220 +ARG ODOO_SHA=db83c23c2c4a4b5c7881cde0c4d8868c7b9adf10 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 0e2f21965..21c58d3ca 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20241209 -ARG ODOO_SHA=e770c1c522d51a81e1b635babd9be08df17fa604 +ARG ODOO_RELEASE=20241220 +ARG ODOO_SHA=449cd495882dc0f35bc11632414fcdc585ed350e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From cb992de79edab3b98702fb33fa6ccfc04aa00861 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 6 Jan 2025 15:01:12 +0100 Subject: [PATCH 179/208] [REF] Odoo 16.0-18.0: update to release 20250106 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index b39d38c79..cccd2d55a 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20241220 -ARG ODOO_SHA=6312a02426f8b8c8b7578947cd8733e8f042de54 +ARG ODOO_RELEASE=20250106 +ARG ODOO_SHA=333d25fa5ce0e5c43149800d50a7870f3b2c90ec RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 84eb1e0a3..4b61f670d 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20241220 -ARG ODOO_SHA=db83c23c2c4a4b5c7881cde0c4d8868c7b9adf10 +ARG ODOO_RELEASE=20250106 +ARG ODOO_SHA=992ed03cd110444dadd906fff010e3becd275148 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 21c58d3ca..0ba35dc05 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20241220 -ARG ODOO_SHA=449cd495882dc0f35bc11632414fcdc585ed350e +ARG ODOO_RELEASE=20250106 +ARG ODOO_SHA=3517a8f0e635553c98ec8c52787e1fb7c7c1937a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From a1b72bf09764b88ae69f1ffd51f5ebc283741aa0 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 15 Jan 2025 13:28:41 +0100 Subject: [PATCH 180/208] [REF] Odoo 16.0-18.0: update to release 20250115 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index cccd2d55a..a2e50ba18 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250106 -ARG ODOO_SHA=333d25fa5ce0e5c43149800d50a7870f3b2c90ec +ARG ODOO_RELEASE=20250115 +ARG ODOO_SHA=442da1ce17c084cdfd091dcecba4bef79c081838 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 4b61f670d..afe415566 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250106 -ARG ODOO_SHA=992ed03cd110444dadd906fff010e3becd275148 +ARG ODOO_RELEASE=20250115 +ARG ODOO_SHA=c149d34b84dae91e0b8fd173c9e2e9bc82a8b60f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 0ba35dc05..d9698ede5 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250106 -ARG ODOO_SHA=3517a8f0e635553c98ec8c52787e1fb7c7c1937a +ARG ODOO_RELEASE=20250115 +ARG ODOO_SHA=81e4f8d693ad8d49e37f2e5f6766b2746320b7cb RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From e664ad3f77c19eda081040e36ed16f84d505af8d Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 23 Jan 2025 10:24:41 +0100 Subject: [PATCH 181/208] [REF] Odoo 16.0-18.0: update to release 20250123 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index a2e50ba18..28e2c238b 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250115 -ARG ODOO_SHA=442da1ce17c084cdfd091dcecba4bef79c081838 +ARG ODOO_RELEASE=20250123 +ARG ODOO_SHA=62823d0d042f2bfba7d4114db2c9272d48c136c8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index afe415566..d1e32e5fc 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250115 -ARG ODOO_SHA=c149d34b84dae91e0b8fd173c9e2e9bc82a8b60f +ARG ODOO_RELEASE=20250123 +ARG ODOO_SHA=63c4ed2e00c754ff5fecfc87a4c3fd8c518d56e7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index d9698ede5..fea0096fd 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250115 -ARG ODOO_SHA=81e4f8d693ad8d49e37f2e5f6766b2746320b7cb +ARG ODOO_RELEASE=20250123 +ARG ODOO_SHA=b455a34a4c6e7d7325d1a5c6033d04c2f9b2810f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From ece292231c5c56d64a9c78c42308d526caaf4888 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 31 Jan 2025 10:32:32 +0100 Subject: [PATCH 182/208] [REF] Odoo 16.0-18.0: update to release 20250131 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 28e2c238b..efee152ae 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250123 -ARG ODOO_SHA=62823d0d042f2bfba7d4114db2c9272d48c136c8 +ARG ODOO_RELEASE=20250131 +ARG ODOO_SHA=ce36944289e17a9dcdde842ba9ad8508f9436237 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index d1e32e5fc..2cb0878ae 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250123 -ARG ODOO_SHA=63c4ed2e00c754ff5fecfc87a4c3fd8c518d56e7 +ARG ODOO_RELEASE=20250131 +ARG ODOO_SHA=985a939e070acb3ef2fa1b8b4f5d779c9e8d2733 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index fea0096fd..e0a86ce50 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250123 -ARG ODOO_SHA=b455a34a4c6e7d7325d1a5c6033d04c2f9b2810f +ARG ODOO_RELEASE=20250131 +ARG ODOO_SHA=7ca4d5ab97b14573489bdef9c5bdcb9f694975ca RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From e70672aff8195df28d62be95d3b890bd4d531d35 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 7 Feb 2025 11:52:51 +0100 Subject: [PATCH 183/208] [REF] Odoo 16.0-18.0: update to release 20250207 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index efee152ae..7467ca593 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250131 -ARG ODOO_SHA=ce36944289e17a9dcdde842ba9ad8508f9436237 +ARG ODOO_RELEASE=20250207 +ARG ODOO_SHA=5ccf115b98cc27f86bdc30d1220cbcf7b4276f6c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 2cb0878ae..a9c9b2560 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250131 -ARG ODOO_SHA=985a939e070acb3ef2fa1b8b4f5d779c9e8d2733 +ARG ODOO_RELEASE=20250207 +ARG ODOO_SHA=99e6b16a8062831a8458a1d60f85bc637ed03bbb RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index e0a86ce50..d1882e2ef 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250131 -ARG ODOO_SHA=7ca4d5ab97b14573489bdef9c5bdcb9f694975ca +ARG ODOO_RELEASE=20250207 +ARG ODOO_SHA=5658df4949b61e3b910aaa1000ec2b14c2b565c9 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 061cbb890fb7750146483717c32d9f533856468e Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 18 Feb 2025 09:26:12 +0100 Subject: [PATCH 184/208] [REF] Odoo 16.0-18.0: update to release 20250218 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 7467ca593..137266dff 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250207 -ARG ODOO_SHA=5ccf115b98cc27f86bdc30d1220cbcf7b4276f6c +ARG ODOO_RELEASE=20250218 +ARG ODOO_SHA=b95e7c08cfdb8d0d25a2016cc5ef295e283da96b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index a9c9b2560..86791a5e5 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250207 -ARG ODOO_SHA=99e6b16a8062831a8458a1d60f85bc637ed03bbb +ARG ODOO_RELEASE=20250218 +ARG ODOO_SHA=89289fe99db80d02fdabeb2fa63164f5c0464c43 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index d1882e2ef..2bc62fbf8 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250207 -ARG ODOO_SHA=5658df4949b61e3b910aaa1000ec2b14c2b565c9 +ARG ODOO_RELEASE=20250218 +ARG ODOO_SHA=122896192ed221711dd471d27b2bd2f934c2ec07 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 768a1e5da82712f358b0a39b693a252f5cb43ce1 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 11 Mar 2025 11:28:40 +0100 Subject: [PATCH 185/208] [REF] Odoo 16.0-18.0: update to release 20250311 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 137266dff..c3e60e194 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250218 -ARG ODOO_SHA=b95e7c08cfdb8d0d25a2016cc5ef295e283da96b +ARG ODOO_RELEASE=20250311 +ARG ODOO_SHA=438bd032c85e128dacb6c17e8bfcd694edf4305b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 86791a5e5..e6a5c5d8f 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250218 -ARG ODOO_SHA=89289fe99db80d02fdabeb2fa63164f5c0464c43 +ARG ODOO_RELEASE=20250311 +ARG ODOO_SHA=13db9f16b7047720ecb803ad8312500fb4e044d1 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 2bc62fbf8..746b4df6f 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250218 -ARG ODOO_SHA=122896192ed221711dd471d27b2bd2f934c2ec07 +ARG ODOO_RELEASE=20250311 +ARG ODOO_SHA=de629e8416caca2475aa59cf73049fc89bf5ea5b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 7f951108da3d376c59a8fe25523f044060870534 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 20 Mar 2025 12:33:43 +0100 Subject: [PATCH 186/208] [REF] Odoo 16.0-18.0: update to release 20250320 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index c3e60e194..6e620b458 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250311 -ARG ODOO_SHA=438bd032c85e128dacb6c17e8bfcd694edf4305b +ARG ODOO_RELEASE=20250320 +ARG ODOO_SHA=afeb7a27c193173e499ad6c9e7d6c391e53b7834 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index e6a5c5d8f..99ef3f5a3 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250311 -ARG ODOO_SHA=13db9f16b7047720ecb803ad8312500fb4e044d1 +ARG ODOO_RELEASE=20250320 +ARG ODOO_SHA=c427512d5be13d9f7de37564f291b96edc556919 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 746b4df6f..75c73ef19 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250311 -ARG ODOO_SHA=de629e8416caca2475aa59cf73049fc89bf5ea5b +ARG ODOO_RELEASE=20250320 +ARG ODOO_SHA=f2b9056ce21821292062f3d753dc38dacc3afe4d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 564eb08e948bd8cb9cd5422e4aabdad72cdd952a Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 1 Apr 2025 15:33:26 +0200 Subject: [PATCH 187/208] [REF] Odoo 16.0-18.0: update to release 20250401 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 6e620b458..c33965940 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250320 -ARG ODOO_SHA=afeb7a27c193173e499ad6c9e7d6c391e53b7834 +ARG ODOO_RELEASE=20250401 +ARG ODOO_SHA=b2964a946a8daebf40453dc30f97bfa093471b0b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 99ef3f5a3..841d27ce4 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250320 -ARG ODOO_SHA=c427512d5be13d9f7de37564f291b96edc556919 +ARG ODOO_RELEASE=20250401 +ARG ODOO_SHA=7c4814eb00f0eb50ef5a16c31f241d6e69a05bb2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 75c73ef19..4d4ed67bf 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250320 -ARG ODOO_SHA=f2b9056ce21821292062f3d753dc38dacc3afe4d +ARG ODOO_RELEASE=20250401 +ARG ODOO_SHA=e855a2ae12dd342571629c9e9e7e531bebff3fb2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 515f1249ead0e69758adecfe9a86584266074e85 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 15 Apr 2025 16:25:16 +0200 Subject: [PATCH 188/208] [REF] Odoo 16.0-18.0: update to release 20250415 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index c33965940..cc3ab3546 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250401 -ARG ODOO_SHA=b2964a946a8daebf40453dc30f97bfa093471b0b +ARG ODOO_RELEASE=20250415 +ARG ODOO_SHA=4dba1e739c24a394f00cb6167fd84f9c9f6819b3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 841d27ce4..259557824 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250401 -ARG ODOO_SHA=7c4814eb00f0eb50ef5a16c31f241d6e69a05bb2 +ARG ODOO_RELEASE=20250415 +ARG ODOO_SHA=c6145d4f40a728b0690ebb118d6331475c159566 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 4d4ed67bf..8e4a4ce89 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250401 -ARG ODOO_SHA=e855a2ae12dd342571629c9e9e7e531bebff3fb2 +ARG ODOO_RELEASE=20250415 +ARG ODOO_SHA=5011f09e346a00583ad38558edfcf309360fa53c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 4cb56b39df0cc06093b6185a609609e1cf264371 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 28 Apr 2025 10:21:35 +0200 Subject: [PATCH 189/208] [REF] Odoo 16.0-18.0: update to release 20250428 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index cc3ab3546..c9ac04fd7 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250415 -ARG ODOO_SHA=4dba1e739c24a394f00cb6167fd84f9c9f6819b3 +ARG ODOO_RELEASE=20250428 +ARG ODOO_SHA=e5d936d73b4c08ce62eedebf7aa6d626507cee8b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 259557824..ea834e0e7 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250415 -ARG ODOO_SHA=c6145d4f40a728b0690ebb118d6331475c159566 +ARG ODOO_RELEASE=20250428 +ARG ODOO_SHA=7c3973809e0cf91494cfa2e795a43378263ca6e8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 8e4a4ce89..12718e404 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250415 -ARG ODOO_SHA=5011f09e346a00583ad38558edfcf309360fa53c +ARG ODOO_RELEASE=20250428 +ARG ODOO_SHA=952a8f7148a7652809546ee7acdc2d66c09e04d9 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 5d67b9585c0e29c9dccc0b3f484eedc4e5c46714 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 20 May 2025 08:38:43 +0200 Subject: [PATCH 190/208] [REF] Odoo 16.0-18.0: update to release 20250520 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index c9ac04fd7..27e974f50 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250428 -ARG ODOO_SHA=e5d936d73b4c08ce62eedebf7aa6d626507cee8b +ARG ODOO_RELEASE=20250520 +ARG ODOO_SHA=7048493a9889f1f9fa244872401f3983360286ad RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index ea834e0e7..d10ec6ad4 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250428 -ARG ODOO_SHA=7c3973809e0cf91494cfa2e795a43378263ca6e8 +ARG ODOO_RELEASE=20250520 +ARG ODOO_SHA=4b012e56c605fb2a2d8a0f04c4c09110effbd44c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 12718e404..17ade8123 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250428 -ARG ODOO_SHA=952a8f7148a7652809546ee7acdc2d66c09e04d9 +ARG ODOO_RELEASE=20250520 +ARG ODOO_SHA=ce904bed4ffc98863a1ed26e4b6fe27a300262e2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 5baa064da27446d2c9aa4b087cc5ead956bc2a20 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 6 Jun 2025 16:44:58 +0200 Subject: [PATCH 191/208] [REF] Odoo 16.0-18.0: update to release 20250606 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 27e974f50..dd296e1fe 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250520 -ARG ODOO_SHA=7048493a9889f1f9fa244872401f3983360286ad +ARG ODOO_RELEASE=20250606 +ARG ODOO_SHA=6c17bfea51c8b371140b947b14e7e44ef65f1b08 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index d10ec6ad4..a66299aa5 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250520 -ARG ODOO_SHA=4b012e56c605fb2a2d8a0f04c4c09110effbd44c +ARG ODOO_RELEASE=20250606 +ARG ODOO_SHA=1898185cb41509fa2eca7ec88dddd37afa356f89 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 17ade8123..d5eba127a 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250520 -ARG ODOO_SHA=ce904bed4ffc98863a1ed26e4b6fe27a300262e2 +ARG ODOO_RELEASE=20250606 +ARG ODOO_SHA=25d2db3f75cc930fbf35d819d9fb812c93a645ce RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From b254689862e8a1bbb9624bf86022867544582dd2 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 18 Jun 2025 16:35:54 +0200 Subject: [PATCH 192/208] [REF] Odoo 16.0-18.0: update to release 20250618 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index dd296e1fe..9f0e89c9d 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250606 -ARG ODOO_SHA=6c17bfea51c8b371140b947b14e7e44ef65f1b08 +ARG ODOO_RELEASE=20250618 +ARG ODOO_SHA=8ef8e9aee88108cf7c6f249381e8016752eefead RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index a66299aa5..5f9236a75 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250606 -ARG ODOO_SHA=1898185cb41509fa2eca7ec88dddd37afa356f89 +ARG ODOO_RELEASE=20250618 +ARG ODOO_SHA=38091d03d1680a2ce10ecb90a6868ce6ee7ba808 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index d5eba127a..d6fb89239 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250606 -ARG ODOO_SHA=25d2db3f75cc930fbf35d819d9fb812c93a645ce +ARG ODOO_RELEASE=20250618 +ARG ODOO_SHA=890716bb151cf5e9abb4ae4f33e94705ae83db1b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From fc0fbafb02e82e1d17bcf22d10466d6c6fb55a7b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 10 Jul 2025 16:32:17 +0200 Subject: [PATCH 193/208] [REF] Odoo 16.0-18.0: update to release 20250710 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 9f0e89c9d..5d3bd2cf9 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250618 -ARG ODOO_SHA=8ef8e9aee88108cf7c6f249381e8016752eefead +ARG ODOO_RELEASE=20250710 +ARG ODOO_SHA=19cd95eede623d4e0c544267af91a4bc14b204db RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 5f9236a75..022d98ca0 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250618 -ARG ODOO_SHA=38091d03d1680a2ce10ecb90a6868ce6ee7ba808 +ARG ODOO_RELEASE=20250710 +ARG ODOO_SHA=97b1dd31e5b279d8d9bc9e880794e0f47dbf9f5b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index d6fb89239..1edb1af44 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250618 -ARG ODOO_SHA=890716bb151cf5e9abb4ae4f33e94705ae83db1b +ARG ODOO_RELEASE=20250710 +ARG ODOO_SHA=7859985576e247950959a2158c10af319e716e3e RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From aa4008ad317c2e442c75ff3540cc95373f44aec8 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 25 Jul 2025 16:16:20 +0200 Subject: [PATCH 194/208] [REF] Odoo 16.0-18.0: update to release 20250725 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 5d3bd2cf9..821826c4a 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250710 -ARG ODOO_SHA=19cd95eede623d4e0c544267af91a4bc14b204db +ARG ODOO_RELEASE=20250725 +ARG ODOO_SHA=4238212480aadbe5a7a6e5c6d2da29cee3297003 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 022d98ca0..e65416ef1 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250710 -ARG ODOO_SHA=97b1dd31e5b279d8d9bc9e880794e0f47dbf9f5b +ARG ODOO_RELEASE=20250725 +ARG ODOO_SHA=776c9e48afff1348a0410628a17d0552cb4599a3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 1edb1af44..c5824f2c3 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250710 -ARG ODOO_SHA=7859985576e247950959a2158c10af319e716e3e +ARG ODOO_RELEASE=20250725 +ARG ODOO_SHA=52215335b04ab9a0991ad1af37be6e07a5b3b276 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From e35962374be54c7797b1f28bf7a2e046f145fd82 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 7 Aug 2025 09:18:18 +0200 Subject: [PATCH 195/208] [REF] Odoo 16.0-18.0: update to release 20250807 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 821826c4a..99d5e6452 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250725 -ARG ODOO_SHA=4238212480aadbe5a7a6e5c6d2da29cee3297003 +ARG ODOO_RELEASE=20250807 +ARG ODOO_SHA=e77cd6f4664a81303035bf56ee0f6f1827a20fee RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index e65416ef1..86461b31a 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250725 -ARG ODOO_SHA=776c9e48afff1348a0410628a17d0552cb4599a3 +ARG ODOO_RELEASE=20250807 +ARG ODOO_SHA=060dbebfa0acc3f69fb3a458c2ce7b732a9624ed RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index c5824f2c3..c03026ed8 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250725 -ARG ODOO_SHA=52215335b04ab9a0991ad1af37be6e07a5b3b276 +ARG ODOO_RELEASE=20250807 +ARG ODOO_SHA=109d077dd280292aa92daf18777cb772e644f972 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 0461e8225b4aee856cc74d893c89cb4e3c6d43f1 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 19 Aug 2025 10:02:42 +0200 Subject: [PATCH 196/208] [REF] Odoo 16.0-18.0: update to release 20250819 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 99d5e6452..95ffa4ebc 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250807 -ARG ODOO_SHA=e77cd6f4664a81303035bf56ee0f6f1827a20fee +ARG ODOO_RELEASE=20250819 +ARG ODOO_SHA=6e4d8446d4a6af7c147f84a5b3d824a7ddaec5c5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 86461b31a..18afe1297 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250807 -ARG ODOO_SHA=060dbebfa0acc3f69fb3a458c2ce7b732a9624ed +ARG ODOO_RELEASE=20250819 +ARG ODOO_SHA=f342ea8c4ac7944ecee4b7f023903fd528f988e6 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index c03026ed8..c7e4b579f 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250807 -ARG ODOO_SHA=109d077dd280292aa92daf18777cb772e644f972 +ARG ODOO_RELEASE=20250819 +ARG ODOO_SHA=25daea677dc7b60cc25ec1eebd16d1c8e3f77a8a RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 5229f719d751ea7f375f48b8ba8483894d04ab63 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 9 Sep 2025 15:16:03 +0200 Subject: [PATCH 197/208] [REF] Odoo 16.0-18.0: update to release 20250909 --- 16.0/Dockerfile | 4 ++-- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 95ffa4ebc..c9ace9bae 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -69,8 +69,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250819 -ARG ODOO_SHA=6e4d8446d4a6af7c147f84a5b3d824a7ddaec5c5 +ARG ODOO_RELEASE=20250909 +ARG ODOO_SHA=86371b3510555e464caae06eba3373f75fbbb4f5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 18afe1297..47b3297b9 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250819 -ARG ODOO_SHA=f342ea8c4ac7944ecee4b7f023903fd528f988e6 +ARG ODOO_RELEASE=20250909 +ARG ODOO_SHA=cef7734a1be7f33bea6804ea2408c52bc448d1c0 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index c7e4b579f..60a451619 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250819 -ARG ODOO_SHA=25daea677dc7b60cc25ec1eebd16d1c8e3f77a8a +ARG ODOO_RELEASE=20250909 +ARG ODOO_SHA=3bdf96c966b7b0434b6358e07e7027e3d9b6d92f RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 7ffe127ed91312bc1248ec1968e11f6f5235de53 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 18 Sep 2025 09:56:06 +0200 Subject: [PATCH 198/208] [REM] Odoo 16.0: remove deprecated version --- 16.0/Dockerfile | 102 ------------------------------------------ 16.0/entrypoint.sh | 49 -------------------- 16.0/odoo.conf | 37 --------------- 16.0/wait-for-psql.py | 32 ------------- 4 files changed, 220 deletions(-) delete mode 100644 16.0/Dockerfile delete mode 100755 16.0/entrypoint.sh delete mode 100644 16.0/odoo.conf delete mode 100755 16.0/wait-for-psql.py diff --git a/16.0/Dockerfile b/16.0/Dockerfile deleted file mode 100644 index c9ace9bae..000000000 --- a/16.0/Dockerfile +++ /dev/null @@ -1,102 +0,0 @@ -FROM debian:bullseye-slim -MAINTAINER Odoo S.A. - -SHELL ["/bin/bash", "-xo", "pipefail", "-c"] - -# Generate locale C.UTF-8 for postgres and general locale data -ENV LANG C.UTF-8 - -# Retrieve the target architecture to install the correct wkhtmltopdf package -ARG TARGETARCH - -# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - dirmngr \ - fonts-noto-cjk \ - gnupg \ - libssl-dev \ - node-less \ - npm \ - python3-magic \ - python3-num2words \ - python3-odf \ - python3-pdfminer \ - python3-pip \ - python3-phonenumbers \ - python3-pyldap \ - python3-qrcode \ - python3-renderpm \ - python3-setuptools \ - python3-slugify \ - python3-vobject \ - python3-watchdog \ - python3-xlrd \ - python3-xlwt \ - xz-utils && \ - if [ -z "${TARGETARCH}" ]; then \ - TARGETARCH="$(dpkg --print-architecture)"; \ - fi; \ - WKHTMLTOPDF_ARCH=${TARGETARCH} && \ - case ${TARGETARCH} in \ - "amd64") WKHTMLTOPDF_ARCH=amd64 && WKHTMLTOPDF_SHA=9df8dd7b1e99782f1cfa19aca665969bbd9cc159 ;; \ - "arm64") WKHTMLTOPDF_SHA=58c84db46b11ba0e14abb77a32324b1c257f1f22 ;; \ - "ppc64le" | "ppc64el") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=7ed8f6dcedf5345a3dd4eeb58dc89704d862f9cd ;; \ - esac \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bullseye_${WKHTMLTOPDF_ARCH}.deb \ - && echo ${WKHTMLTOPDF_SHA} wkhtmltox.deb | sha1sum -c - \ - && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb - -# install latest postgresql-client -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ - && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && apt-get update \ - && apt-get install --no-install-recommends -y postgresql-client \ - && rm -f /etc/apt/sources.list.d/pgdg.list \ - && rm -rf /var/lib/apt/lists/* - -# Install rtlcss (on Debian buster) -RUN npm install -g rtlcss - -# Install Odoo -ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20250909 -ARG ODOO_SHA=86371b3510555e464caae06eba3373f75fbbb4f5 -RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ - && apt-get update \ - && apt-get -y install --no-install-recommends ./odoo.deb \ - && rm -rf /var/lib/apt/lists/* odoo.deb - -# Copy entrypoint script and Odoo configuration file -COPY ./entrypoint.sh / -COPY ./odoo.conf /etc/odoo/ - -# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons -RUN chown odoo /etc/odoo/odoo.conf \ - && mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons -VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] - -# Expose Odoo services -EXPOSE 8069 8071 8072 - -# Set the default config file -ENV ODOO_RC /etc/odoo/odoo.conf - -COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py - -# Set default user when running the container -USER odoo - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["odoo"] diff --git a/16.0/entrypoint.sh b/16.0/entrypoint.sh deleted file mode 100755 index f802bcb25..000000000 --- a/16.0/entrypoint.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -set -e - -if [ -v PASSWORD_FILE ]; then - PASSWORD="$(< $PASSWORD_FILE)" -fi - -# set the postgres database host, port, user and password according to the environment -# and pass them as arguments to the odoo process if not present in the config file -: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} -: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} -: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} - -DB_ARGS=() -function check_config() { - param="$1" - value="$2" - if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then - value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') - fi; - DB_ARGS+=("--${param}") - DB_ARGS+=("${value}") -} -check_config "db_host" "$HOST" -check_config "db_port" "$PORT" -check_config "db_user" "$USER" -check_config "db_password" "$PASSWORD" - -case "$1" in - -- | odoo) - shift - if [[ "$1" == "scaffold" ]] ; then - exec odoo "$@" - else - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - fi - ;; - -*) - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - ;; - *) - exec "$@" -esac - -exit 1 diff --git a/16.0/odoo.conf b/16.0/odoo.conf deleted file mode 100644 index 28f70c105..000000000 --- a/16.0/odoo.conf +++ /dev/null @@ -1,37 +0,0 @@ -[options] -addons_path = /mnt/extra-addons -data_dir = /var/lib/odoo -; admin_passwd = admin -; csv_internal_sep = , -; db_maxconn = 64 -; db_name = False -; db_template = template1 -; dbfilter = .* -; debug_mode = False -; email_from = False -; limit_memory_hard = 2684354560 -; limit_memory_soft = 2147483648 -; limit_request = 8192 -; limit_time_cpu = 60 -; limit_time_real = 120 -; list_db = True -; log_db = False -; log_handler = [':INFO'] -; log_level = info -; logfile = None -; longpolling_port = 8072 -; max_cron_threads = 2 -; osv_memory_age_limit = 1.0 -; osv_memory_count_limit = False -; smtp_password = False -; smtp_port = 25 -; smtp_server = localhost -; smtp_ssl = False -; smtp_user = False -; workers = 0 -; xmlrpc = True -; xmlrpc_interface = -; xmlrpc_port = 8069 -; xmlrpcs = True -; xmlrpcs_interface = -; xmlrpcs_port = 8071 diff --git a/16.0/wait-for-psql.py b/16.0/wait-for-psql.py deleted file mode 100755 index a55f44098..000000000 --- a/16.0/wait-for-psql.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import psycopg2 -import sys -import time - - -if __name__ == '__main__': - arg_parser = argparse.ArgumentParser() - arg_parser.add_argument('--db_host', required=True) - arg_parser.add_argument('--db_port', required=True) - arg_parser.add_argument('--db_user', required=True) - arg_parser.add_argument('--db_password', required=True) - arg_parser.add_argument('--timeout', type=int, default=5) - - args = arg_parser.parse_args() - - start_time = time.time() - while (time.time() - start_time) < args.timeout: - try: - conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') - error = '' - break - except psycopg2.OperationalError as e: - error = e - else: - conn.close() - time.sleep(1) - - if error: - print("Database connection failure: %s" % error, file=sys.stderr) - sys.exit(1) From af8ffb531be7034011410d00a2044e94df1cc122 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 18 Sep 2025 11:04:32 +0200 Subject: [PATCH 199/208] [REF] Odoo 17.0-18.0: update to release 20250918 --- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 47b3297b9..d1ae4b7ae 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250909 -ARG ODOO_SHA=cef7734a1be7f33bea6804ea2408c52bc448d1c0 +ARG ODOO_RELEASE=20250918 +ARG ODOO_SHA=476f97c93065c284b6b984266e70abce2c0c7b54 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 60a451619..5e3b9ac19 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250909 -ARG ODOO_SHA=3bdf96c966b7b0434b6358e07e7027e3d9b6d92f +ARG ODOO_RELEASE=20250918 +ARG ODOO_SHA=87dee1ca919a9920f1ad1b4c08933052e47c0add RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 9404592737f4a58dade648ba2c9c35de1feb2fb4 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 18 Sep 2025 10:02:43 +0200 Subject: [PATCH 200/208] [ADD] Odoo: 19.0 --- 19.0/Dockerfile | 104 ++++++++++++++++++++++++++++++++++++++++++ 19.0/entrypoint.sh | 49 ++++++++++++++++++++ 19.0/odoo.conf | 37 +++++++++++++++ 19.0/wait-for-psql.py | 32 +++++++++++++ 4 files changed, 222 insertions(+) create mode 100644 19.0/Dockerfile create mode 100755 19.0/entrypoint.sh create mode 100644 19.0/odoo.conf create mode 100755 19.0/wait-for-psql.py diff --git a/19.0/Dockerfile b/19.0/Dockerfile new file mode 100644 index 000000000..2b3b96d97 --- /dev/null +++ b/19.0/Dockerfile @@ -0,0 +1,104 @@ +FROM ubuntu:noble +MAINTAINER Odoo S.A. + +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + +# Generate locale C.UTF-8 for postgres and general locale data +ENV LANG en_US.UTF-8 + +# Retrieve the target architecture to install the correct wkhtmltopdf package +ARG TARGETARCH + +# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + dirmngr \ + fonts-noto-cjk \ + gnupg \ + libssl-dev \ + node-less \ + npm \ + python3-magic \ + python3-num2words \ + python3-odf \ + python3-pdfminer \ + python3-pip \ + python3-phonenumbers \ + python3-pyldap \ + python3-qrcode \ + python3-renderpm \ + python3-setuptools \ + python3-slugify \ + python3-vobject \ + python3-watchdog \ + python3-xlrd \ + python3-xlwt \ + xz-utils && \ + if [ -z "${TARGETARCH}" ]; then \ + TARGETARCH="$(dpkg --print-architecture)"; \ + fi; \ + WKHTMLTOPDF_ARCH=${TARGETARCH} && \ + case ${TARGETARCH} in \ + "amd64") WKHTMLTOPDF_ARCH=amd64 && WKHTMLTOPDF_SHA=967390a759707337b46d1c02452e2bb6b2dc6d59 ;; \ + "arm64") WKHTMLTOPDF_SHA=90f6e69896d51ef77339d3f3a20f8582bdf496cc ;; \ + "ppc64le" | "ppc64el") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=5312d7d34a25b321282929df82e3574319aed25c ;; \ + esac \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.jammy_${WKHTMLTOPDF_ARCH}.deb \ + && echo ${WKHTMLTOPDF_SHA} wkhtmltox.deb | sha1sum -c - \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb + +# install latest postgresql-client +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ + && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ + && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ + && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && apt-get update \ + && apt-get install --no-install-recommends -y postgresql-client \ + && rm -f /etc/apt/sources.list.d/pgdg.list \ + && rm -rf /var/lib/apt/lists/* + +# Install rtlcss (on Debian buster) +RUN npm install -g rtlcss + +# Install Odoo +ENV ODOO_VERSION 19.0 +ARG ODOO_RELEASE=20250918 +ARG ODOO_SHA=3b7db7702c236b9060d5668a39a5ac61944b1153 +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ + && apt-get update \ + && apt-get -y install --no-install-recommends ./odoo.deb \ + && rm -rf /var/lib/apt/lists/* odoo.deb + +# Copy entrypoint script and Odoo configuration file +COPY ./entrypoint.sh / +COPY ./odoo.conf /etc/odoo/ + +# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons +RUN chown odoo /etc/odoo/odoo.conf \ + && mkdir -p /mnt/extra-addons \ + && chown -R odoo /mnt/extra-addons +VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] + +# Expose Odoo services +EXPOSE 8069 8071 8072 + +# Set the default config file +ENV ODOO_RC /etc/odoo/odoo.conf + +COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py + +# Set default user when running the container +USER odoo + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["odoo"] diff --git a/19.0/entrypoint.sh b/19.0/entrypoint.sh new file mode 100755 index 000000000..f802bcb25 --- /dev/null +++ b/19.0/entrypoint.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +set -e + +if [ -v PASSWORD_FILE ]; then + PASSWORD="$(< $PASSWORD_FILE)" +fi + +# set the postgres database host, port, user and password according to the environment +# and pass them as arguments to the odoo process if not present in the config file +: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} + +DB_ARGS=() +function check_config() { + param="$1" + value="$2" + if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then + value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') + fi; + DB_ARGS+=("--${param}") + DB_ARGS+=("${value}") +} +check_config "db_host" "$HOST" +check_config "db_port" "$PORT" +check_config "db_user" "$USER" +check_config "db_password" "$PASSWORD" + +case "$1" in + -- | odoo) + shift + if [[ "$1" == "scaffold" ]] ; then + exec odoo "$@" + else + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + fi + ;; + -*) + wait-for-psql.py ${DB_ARGS[@]} --timeout=30 + exec odoo "$@" "${DB_ARGS[@]}" + ;; + *) + exec "$@" +esac + +exit 1 diff --git a/19.0/odoo.conf b/19.0/odoo.conf new file mode 100644 index 000000000..28f70c105 --- /dev/null +++ b/19.0/odoo.conf @@ -0,0 +1,37 @@ +[options] +addons_path = /mnt/extra-addons +data_dir = /var/lib/odoo +; admin_passwd = admin +; csv_internal_sep = , +; db_maxconn = 64 +; db_name = False +; db_template = template1 +; dbfilter = .* +; debug_mode = False +; email_from = False +; limit_memory_hard = 2684354560 +; limit_memory_soft = 2147483648 +; limit_request = 8192 +; limit_time_cpu = 60 +; limit_time_real = 120 +; list_db = True +; log_db = False +; log_handler = [':INFO'] +; log_level = info +; logfile = None +; longpolling_port = 8072 +; max_cron_threads = 2 +; osv_memory_age_limit = 1.0 +; osv_memory_count_limit = False +; smtp_password = False +; smtp_port = 25 +; smtp_server = localhost +; smtp_ssl = False +; smtp_user = False +; workers = 0 +; xmlrpc = True +; xmlrpc_interface = +; xmlrpc_port = 8069 +; xmlrpcs = True +; xmlrpcs_interface = +; xmlrpcs_port = 8071 diff --git a/19.0/wait-for-psql.py b/19.0/wait-for-psql.py new file mode 100755 index 000000000..a55f44098 --- /dev/null +++ b/19.0/wait-for-psql.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 +import argparse +import psycopg2 +import sys +import time + + +if __name__ == '__main__': + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument('--db_host', required=True) + arg_parser.add_argument('--db_port', required=True) + arg_parser.add_argument('--db_user', required=True) + arg_parser.add_argument('--db_password', required=True) + arg_parser.add_argument('--timeout', type=int, default=5) + + args = arg_parser.parse_args() + + start_time = time.time() + while (time.time() - start_time) < args.timeout: + try: + conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') + error = '' + break + except psycopg2.OperationalError as e: + error = e + else: + conn.close() + time.sleep(1) + + if error: + print("Database connection failure: %s" % error, file=sys.stderr) + sys.exit(1) From 529a49c8b7da4201fc461434f9ec8ad170ef3202 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 30 Sep 2025 10:05:28 +0200 Subject: [PATCH 201/208] [REF] Odoo 17.0-19.0: update to release 20250930 --- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 19.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/17.0/Dockerfile b/17.0/Dockerfile index d1ae4b7ae..eef98238d 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250918 -ARG ODOO_SHA=476f97c93065c284b6b984266e70abce2c0c7b54 +ARG ODOO_RELEASE=20250930 +ARG ODOO_SHA=96bb5a5134ac430686599588bef22b2b28a625f3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 5e3b9ac19..08dae3a02 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250918 -ARG ODOO_SHA=87dee1ca919a9920f1ad1b4c08933052e47c0add +ARG ODOO_RELEASE=20250930 +ARG ODOO_SHA=e1d45235189baf437efe38e8fa3a32b19e93efb2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/19.0/Dockerfile b/19.0/Dockerfile index 2b3b96d97..ff3095716 100644 --- a/19.0/Dockerfile +++ b/19.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 19.0 -ARG ODOO_RELEASE=20250918 -ARG ODOO_SHA=3b7db7702c236b9060d5668a39a5ac61944b1153 +ARG ODOO_RELEASE=20250930 +ARG ODOO_SHA=e52a931c56e47595ae3578fc689562f7305a74f4 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From f24d0401287edf563bacf60de5f08f8edee8cf19 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 8 Oct 2025 16:56:20 +0200 Subject: [PATCH 202/208] [REF] Odoo 17.0-19.0: update to release 20251008 --- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 19.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/17.0/Dockerfile b/17.0/Dockerfile index eef98238d..cdc3a8a46 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20250930 -ARG ODOO_SHA=96bb5a5134ac430686599588bef22b2b28a625f3 +ARG ODOO_RELEASE=20251008 +ARG ODOO_SHA=108bdab1cd0f0b6dc6dc2a1f8fffa78871d9d9b5 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 08dae3a02..4bf65f17c 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20250930 -ARG ODOO_SHA=e1d45235189baf437efe38e8fa3a32b19e93efb2 +ARG ODOO_RELEASE=20251008 +ARG ODOO_SHA=c15a8eb3791e805b9cd3078f2dd4e0d78130b1c2 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/19.0/Dockerfile b/19.0/Dockerfile index ff3095716..322edb606 100644 --- a/19.0/Dockerfile +++ b/19.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 19.0 -ARG ODOO_RELEASE=20250930 -ARG ODOO_SHA=e52a931c56e47595ae3578fc689562f7305a74f4 +ARG ODOO_RELEASE=20251008 +ARG ODOO_SHA=36dde7d124ca4b0f957949f0b2c88b87d9da07f7 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 0ee804078811d2bc209b5fac3060f5f66de7747b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 21 Oct 2025 13:42:44 +0200 Subject: [PATCH 203/208] [REF] Odoo 17.0-19.0: update to release 20251021 --- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 19.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/17.0/Dockerfile b/17.0/Dockerfile index cdc3a8a46..cb13702b5 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20251008 -ARG ODOO_SHA=108bdab1cd0f0b6dc6dc2a1f8fffa78871d9d9b5 +ARG ODOO_RELEASE=20251021 +ARG ODOO_SHA=d8c3f991cc028a6c9022d8b16d3a790da7ca8952 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 4bf65f17c..8c89506b4 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20251008 -ARG ODOO_SHA=c15a8eb3791e805b9cd3078f2dd4e0d78130b1c2 +ARG ODOO_RELEASE=20251021 +ARG ODOO_SHA=29dcdb90f62464d7de48eead12df402ab85c132c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/19.0/Dockerfile b/19.0/Dockerfile index 322edb606..aa4b9daad 100644 --- a/19.0/Dockerfile +++ b/19.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 19.0 -ARG ODOO_RELEASE=20251008 -ARG ODOO_SHA=36dde7d124ca4b0f957949f0b2c88b87d9da07f7 +ARG ODOO_RELEASE=20251021 +ARG ODOO_SHA=eeba5130e7d34caa1c8459df926f1a207c314857 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 3ca54f4a7f7325b3b58fdb586143dd406a4863fa Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 6 Nov 2025 16:25:36 +0100 Subject: [PATCH 204/208] [REF] Odoo 17.0-19.0: update to release 20251106 --- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 19.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/17.0/Dockerfile b/17.0/Dockerfile index cb13702b5..05e964653 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20251021 -ARG ODOO_SHA=d8c3f991cc028a6c9022d8b16d3a790da7ca8952 +ARG ODOO_RELEASE=20251106 +ARG ODOO_SHA=605d3adeaa4ae339dd4741d0da148d219aee8419 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 8c89506b4..825e6aa6b 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20251021 -ARG ODOO_SHA=29dcdb90f62464d7de48eead12df402ab85c132c +ARG ODOO_RELEASE=20251106 +ARG ODOO_SHA=8f777f0d4eeb67786ae78e5330ccd5d6931c604b RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/19.0/Dockerfile b/19.0/Dockerfile index aa4b9daad..d007b18cd 100644 --- a/19.0/Dockerfile +++ b/19.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 19.0 -ARG ODOO_RELEASE=20251021 -ARG ODOO_SHA=eeba5130e7d34caa1c8459df926f1a207c314857 +ARG ODOO_RELEASE=20251106 +ARG ODOO_SHA=1773144d840cb0549968aee1edaa9dfbb6df8208 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 902542fd54e298be8be875ca79dd0a87afbe3fa1 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 21 Nov 2025 16:57:31 +0100 Subject: [PATCH 205/208] [REF] Odoo 17.0-19.0: update to release 20251121 --- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 19.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 05e964653..0913dcd4d 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20251106 -ARG ODOO_SHA=605d3adeaa4ae339dd4741d0da148d219aee8419 +ARG ODOO_RELEASE=20251121 +ARG ODOO_SHA=1acee67205be41870d2de781aa787aa5bbd68f3c RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 825e6aa6b..a7e7bf5d3 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20251106 -ARG ODOO_SHA=8f777f0d4eeb67786ae78e5330ccd5d6931c604b +ARG ODOO_RELEASE=20251121 +ARG ODOO_SHA=a13f7fb056248eb3941cc45f33ddf63917484bb3 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/19.0/Dockerfile b/19.0/Dockerfile index d007b18cd..f59a1880f 100644 --- a/19.0/Dockerfile +++ b/19.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 19.0 -ARG ODOO_RELEASE=20251106 -ARG ODOO_SHA=1773144d840cb0549968aee1edaa9dfbb6df8208 +ARG ODOO_RELEASE=20251121 +ARG ODOO_SHA=6357a789f287485b002acf6888fe8cdd45e2d5d8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From fa9d68a03f140c162e5acdb7f8e81d22ed3ccb9f Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 8 Dec 2025 10:08:16 +0100 Subject: [PATCH 206/208] [REF] Odoo 17.0-19.0: update to release 20251208 --- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 19.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 0913dcd4d..54eb29569 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20251121 -ARG ODOO_SHA=1acee67205be41870d2de781aa787aa5bbd68f3c +ARG ODOO_RELEASE=20251208 +ARG ODOO_SHA=e85e44d173e4e2f56057c0d4f88fab18b80963ff RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index a7e7bf5d3..8bcfa18f3 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20251121 -ARG ODOO_SHA=a13f7fb056248eb3941cc45f33ddf63917484bb3 +ARG ODOO_RELEASE=20251208 +ARG ODOO_SHA=617b8e935dec581d018a7c32bc6e0b759b904031 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/19.0/Dockerfile b/19.0/Dockerfile index f59a1880f..c93f7c3d5 100644 --- a/19.0/Dockerfile +++ b/19.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 19.0 -ARG ODOO_RELEASE=20251121 -ARG ODOO_SHA=6357a789f287485b002acf6888fe8cdd45e2d5d8 +ARG ODOO_RELEASE=20251208 +ARG ODOO_SHA=76c8b61b443676477eea546635aca37b8431dd9d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From cee8710442112aad57f34f797459df1ab1d5ef6a Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 22 Dec 2025 16:39:57 +0100 Subject: [PATCH 207/208] [REF] Odoo 17.0-19.0: update to release 20251222 --- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 19.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 54eb29569..5829d2ca5 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20251208 -ARG ODOO_SHA=e85e44d173e4e2f56057c0d4f88fab18b80963ff +ARG ODOO_RELEASE=20251222 +ARG ODOO_SHA=89bedfe72d8d35aac19b03135ba8e7064e6862ab RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 8bcfa18f3..27e0263af 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20251208 -ARG ODOO_SHA=617b8e935dec581d018a7c32bc6e0b759b904031 +ARG ODOO_RELEASE=20251222 +ARG ODOO_SHA=fc71ac3c039e84f1aa33ab2bf2a3922463eee889 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/19.0/Dockerfile b/19.0/Dockerfile index c93f7c3d5..fbb5022d8 100644 --- a/19.0/Dockerfile +++ b/19.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 19.0 -ARG ODOO_RELEASE=20251208 -ARG ODOO_SHA=76c8b61b443676477eea546635aca37b8431dd9d +ARG ODOO_RELEASE=20251222 +ARG ODOO_SHA=9e8816c0c76e1e89af884ce235032fb071d99510 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ From 2b8f4402b89b43e31cfc6173cad2c2e9cbbcb8ef Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 19 Jan 2026 10:46:16 +0100 Subject: [PATCH 208/208] [REF] Odoo 17.0-19.0: update to release 20260119 --- 17.0/Dockerfile | 4 ++-- 18.0/Dockerfile | 4 ++-- 19.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 5829d2ca5..99b14d81d 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 17.0 -ARG ODOO_RELEASE=20251222 -ARG ODOO_SHA=89bedfe72d8d35aac19b03135ba8e7064e6862ab +ARG ODOO_RELEASE=20260119 +ARG ODOO_SHA=d05da0fdc75fc57ccae2dd5b797183afb0be0ea8 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 27e0263af..26d248976 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20251222 -ARG ODOO_SHA=fc71ac3c039e84f1aa33ab2bf2a3922463eee889 +ARG ODOO_RELEASE=20260119 +ARG ODOO_SHA=798dfc952eed08e0d976364c26dc47a45535be70 RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \ diff --git a/19.0/Dockerfile b/19.0/Dockerfile index fbb5022d8..4d280d6f3 100644 --- a/19.0/Dockerfile +++ b/19.0/Dockerfile @@ -71,8 +71,8 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 19.0 -ARG ODOO_RELEASE=20251222 -ARG ODOO_SHA=9e8816c0c76e1e89af884ce235032fb071d99510 +ARG ODOO_RELEASE=20260118 +ARG ODOO_SHA=9cb5691e31d2d8831887e85cc07268016f522f4d RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && apt-get update \