From 60b3f82cf1ccb05878b6ce7b470ea5ce80753745 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 13 Oct 2017 16:18:10 +0200 Subject: [PATCH 1/9] [ADD] Odoo: 11.0 * Creation of Dockerfile for Odoo version 11.0 release 20171013 --- 11.0/Dockerfile | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 11.0/entrypoint.sh | 42 ++++++++++++++++++++++++++++++++++++ 11.0/odoo.conf | 37 +++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+) create mode 100644 11.0/Dockerfile create mode 100755 11.0/entrypoint.sh create mode 100644 11.0/odoo.conf diff --git a/11.0/Dockerfile b/11.0/Dockerfile new file mode 100644 index 0000000..226d74f --- /dev/null +++ b/11.0/Dockerfile @@ -0,0 +1,54 @@ +FROM debian:stretch +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 \ + node-less \ + python3-pip \ + python3-setuptools \ + python3-renderpm \ + libssl1.0-dev \ + xz-utils \ + && curl -o wkhtmltox.tar.xz -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \ + && echo '3f923f425d345940089e44c1466f6408b9619562 wkhtmltox.tar.xz' | sha1sum -c - \ + && tar xvf wkhtmltox.tar.xz \ + && cp wkhtmltox/lib/* /usr/local/lib/ \ + && cp wkhtmltox/bin/* /usr/local/bin/ \ + && cp -r wkhtmltox/share/man/man1 /usr/local/share/man/ + +# Install Odoo +ENV ODOO_VERSION 11.0 +ENV ODOO_RELEASE 20171013 +RUN set -x; \ + curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo '596e01ef47fda076f086791a12eb360af42d9a14 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/11.0/entrypoint.sh b/11.0/entrypoint.sh new file mode 100755 index 0000000..4f0ef59 --- /dev/null +++ b/11.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/11.0/odoo.conf b/11.0/odoo.conf new file mode 100644 index 0000000..28f70c1 --- /dev/null +++ b/11.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 751e9706bf3a0938fc92b7281fea7ee60481bd8c Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 30 Oct 2017 15:54:40 +0100 Subject: [PATCH 2/9] [REM] Odoo 8.0: Remove deprecated version Odoo 8.0 has reached end of life since October 6, 2017. --- 8.0/Dockerfile | 57 ----------------------------------------- 8.0/entrypoint.sh | 42 ------------------------------ 8.0/openerp-server.conf | 38 --------------------------- 3 files changed, 137 deletions(-) delete mode 100644 8.0/Dockerfile delete mode 100755 8.0/entrypoint.sh delete mode 100644 8.0/openerp-server.conf diff --git a/8.0/Dockerfile b/8.0/Dockerfile deleted file mode 100644 index a522102..0000000 --- a/8.0/Dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -FROM debian:jessie -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 \ - node-less \ - node-clean-css \ - python-gevent \ - python-pip \ - python-pyinotify \ - python-renderpm \ - python-support \ - && curl -o wkhtmltox.deb -SL http://nightly.odoo.com/extra/wkhtmltox-0.12.1.2_linux-jessie-amd64.deb \ - && echo '40e8b906de658a2221b15e4e8cd82565a47d7ee8 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 Odoo -ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20170815 -RUN set -x; \ - curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '5835e966a07e5684b4f7bcc39585276b0bb68254 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 ./openerp-server.conf /etc/odoo/ -RUN chown odoo /etc/odoo/openerp-server.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 OPENERP_SERVER /etc/odoo/openerp-server.conf - -# Set default user when running the container -USER odoo - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["openerp-server"] diff --git a/8.0/entrypoint.sh b/8.0/entrypoint.sh deleted file mode 100755 index a958c3c..0000000 --- a/8.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*=" "$OPENERP_SERVER" ; 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 - -- | openerp-server) - shift - if [[ "$1" == "scaffold" ]] ; then - exec openerp-server "$@" - else - exec openerp-server "$@" "${DB_ARGS[@]}" - fi - ;; - -*) - exec openerp-server "$@" "${DB_ARGS[@]}" - ;; - *) - exec "$@" -esac - -exit 1 diff --git a/8.0/openerp-server.conf b/8.0/openerp-server.conf deleted file mode 100644 index 0a1a0ed..0000000 --- a/8.0/openerp-server.conf +++ /dev/null @@ -1,38 +0,0 @@ -[options] -addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/openerp/addons -data_dir = /var/lib/odoo -auto_reload = True -; 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 199c206737f39c1e2ce3116da031f75d940ed75f Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 30 Oct 2017 16:02:37 +0100 Subject: [PATCH 3/9] [REF] Odoo 9.0-11.0: update to release 20171030 --- 10.0/Dockerfile | 4 ++-- 11.0/Dockerfile | 4 ++-- 9.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/10.0/Dockerfile b/10.0/Dockerfile index f3ec734..6857e6a 100644 --- a/10.0/Dockerfile +++ b/10.0/Dockerfile @@ -23,10 +23,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 10.0 -ENV ODOO_RELEASE 20170815 +ENV ODOO_RELEASE 20171030 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '08d21e6419a72be7a3ad784df7a6fc8a46bbe7d9 odoo.deb' | sha1sum -c - \ + && echo 'b250b2bbcda6056146d323eb0d7a1e609a09d0ec odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 226d74f..5b84152 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -22,10 +22,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 11.0 -ENV ODOO_RELEASE 20171013 +ENV ODOO_RELEASE 20171030 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '596e01ef47fda076f086791a12eb360af42d9a14 odoo.deb' | sha1sum -c - \ + && echo '63d3fd997c850b657b93fb9351624d88d45d1682 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ diff --git a/9.0/Dockerfile b/9.0/Dockerfile index 2a8ecd6..dc0cfe4 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -23,10 +23,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 9.0 -ENV ODOO_RELEASE 20170815 +ENV ODOO_RELEASE 20171030 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}c.${ODOO_RELEASE}_all.deb \ - && echo '3d3b34cbbcd5f3fb739e85a2c855955322c0f328 odoo.deb' | sha1sum -c - \ + && echo '5062e9422ca76f89eaf3edff49e496ca916fcca5 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From bfe3143479f365d4598411b1dae5f8d85e084882 Mon Sep 17 00:00:00 2001 From: Daniel Blanco Date: Tue, 17 Oct 2017 09:23:41 -0300 Subject: [PATCH 4/9] [FIX] Odoo 11.0: add a locale to prevent ascii decode errors Closes #129 --- 11.0/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 5b84152..5899f3b 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -1,6 +1,15 @@ FROM debian:stretch MAINTAINER Odoo S.A. +# Generate locale C.UTF-8 for postgres and general locale data +ENV DEBIAN_FRONTEND noninteractive +RUN apt-get update -qq && apt-get install -y locales -qq +RUN echo 'C.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen +RUN dpkg-reconfigure locales && /usr/sbin/update-locale LANG=C.UTF-8 +ENV LANG C.UTF-8 +ENV LANGUAGE C.UTF-8 +ENV LC_ALL C.UTF-8 + # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf RUN set -x; \ apt-get update \ From feac9b24233137a7c874cfbc0790d19e51c6beff Mon Sep 17 00:00:00 2001 From: Daniel Blanco Date: Tue, 31 Oct 2017 08:34:37 +0100 Subject: [PATCH 5/9] [FIX] Odoo 11.0: Add num2words installation A Debian package does not exists yet for python3-num2words and this package is required for those who want to render textual amounts. Closes #129 --- 11.0/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 5899f3b..280c7a0 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -41,6 +41,7 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file +RUN pip3 install num2words COPY ./entrypoint.sh / COPY ./odoo.conf /etc/odoo/ RUN chown odoo /etc/odoo/odoo.conf From 16d5988408434e4678f3bf6318aabad542dec4ee Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 1 Nov 2017 21:33:20 +0100 Subject: [PATCH 6/9] [REF] Odoo 11.0: simplify locale settings locale settings does not need to re-genreate c.utf-8 as it's already included in Debian Stretch. Also LANG is enough to define the locale needed by Odoo. Finaly, apt-get does not really need to be explicitly set in non interactive mode. apt-get is able to do the right thing. Thanks @tianon --- 11.0/Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 280c7a0..4e9c814 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -2,13 +2,7 @@ FROM debian:stretch MAINTAINER Odoo S.A. # Generate locale C.UTF-8 for postgres and general locale data -ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update -qq && apt-get install -y locales -qq -RUN echo 'C.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen -RUN dpkg-reconfigure locales && /usr/sbin/update-locale LANG=C.UTF-8 ENV LANG C.UTF-8 -ENV LANGUAGE C.UTF-8 -ENV LC_ALL C.UTF-8 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf RUN set -x; \ From b3d6d018f740ad2a816b5209300b875e2760085e Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 22 Jan 2018 11:39:40 +0100 Subject: [PATCH 7/9] [REF] Odoo 9.0-11.0: update to release 20180122 11.0: install python3 package xlwt to allow xlsx export Fixes #161 --- 10.0/Dockerfile | 4 ++-- 11.0/Dockerfile | 6 +++--- 9.0/Dockerfile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/10.0/Dockerfile b/10.0/Dockerfile index 6857e6a..a3e32e1 100644 --- a/10.0/Dockerfile +++ b/10.0/Dockerfile @@ -23,10 +23,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 10.0 -ENV ODOO_RELEASE 20171030 +ENV ODOO_RELEASE 20180122 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo 'b250b2bbcda6056146d323eb0d7a1e609a09d0ec odoo.deb' | sha1sum -c - \ + && echo '836f0fb94aee0d3771cf2188309f6079ee35f83e odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 4e9c814..eac528a 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -25,17 +25,17 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 11.0 -ENV ODOO_RELEASE 20171030 +ENV ODOO_RELEASE 20180122 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '63d3fd997c850b657b93fb9351624d88d45d1682 odoo.deb' | sha1sum -c - \ + && echo '56f61789bc655aaa2c014a3c5f63d80805408359 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 +RUN pip3 install num2words xlwt COPY ./entrypoint.sh / COPY ./odoo.conf /etc/odoo/ RUN chown odoo /etc/odoo/odoo.conf diff --git a/9.0/Dockerfile b/9.0/Dockerfile index dc0cfe4..52c3cf9 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -23,10 +23,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 9.0 -ENV ODOO_RELEASE 20171030 +ENV ODOO_RELEASE 20180122 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}c.${ODOO_RELEASE}_all.deb \ - && echo '5062e9422ca76f89eaf3edff49e496ca916fcca5 odoo.deb' | sha1sum -c - \ + && echo 'a623d188d48f08ce8bb8898355eccc5e5e7e5b04 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From cec9d153fee90dbf065dc6d5ee4624b5db322a90 Mon Sep 17 00:00:00 2001 From: Andreas Raster Date: Mon, 9 Jul 2018 15:49:50 +0200 Subject: [PATCH 8/9] [IMP] Odoo 11.0: add python3-watchdog dependency Closes: #142 Fixes: #194 --- 11.0/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index eac528a..ad8684a 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -16,6 +16,7 @@ RUN set -x; \ python3-renderpm \ libssl1.0-dev \ xz-utils \ + python3-watchdog \ && curl -o wkhtmltox.tar.xz -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \ && echo '3f923f425d345940089e44c1466f6408b9619562 wkhtmltox.tar.xz' | sha1sum -c - \ && tar xvf wkhtmltox.tar.xz \ From 67e5ceb0fa3478a3e3c3428d8062a4dab45be29f Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 10 Jul 2018 10:06:43 +0200 Subject: [PATCH 9/9] [REF] Odoo 9.0-11.0: update to release 20180710 --- 10.0/Dockerfile | 4 ++-- 11.0/Dockerfile | 4 ++-- 9.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/10.0/Dockerfile b/10.0/Dockerfile index a3e32e1..e36f6e9 100644 --- a/10.0/Dockerfile +++ b/10.0/Dockerfile @@ -23,10 +23,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 10.0 -ENV ODOO_RELEASE 20180122 +ENV ODOO_RELEASE 20180710 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '836f0fb94aee0d3771cf2188309f6079ee35f83e odoo.deb' | sha1sum -c - \ + && echo '5aa056fa00a2f405652ba1386807c59ae563af29 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ diff --git a/11.0/Dockerfile b/11.0/Dockerfile index ad8684a..6cf0d7e 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -26,10 +26,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 11.0 -ENV ODOO_RELEASE 20180122 +ENV ODOO_RELEASE 20180710 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '56f61789bc655aaa2c014a3c5f63d80805408359 odoo.deb' | sha1sum -c - \ + && echo 'b843864476bb149d1b5715b7fa3ef726b3658d6a odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ diff --git a/9.0/Dockerfile b/9.0/Dockerfile index 52c3cf9..ae91100 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -23,10 +23,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 9.0 -ENV ODOO_RELEASE 20180122 +ENV ODOO_RELEASE 20180710 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}c.${ODOO_RELEASE}_all.deb \ - && echo 'a623d188d48f08ce8bb8898355eccc5e5e7e5b04 odoo.deb' | sha1sum -c - \ + && echo '79ec48555a83507ba8956f4bb25840f5c033178a odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \