From 3c6b6b584b3ce996851a3247a9e3399d68492305 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Tue, 15 Dec 2015 14:26:57 +0100 Subject: [PATCH 01/25] Odoo: Update 8.0 and 9.0 to version 20151215 --- 8.0/Dockerfile | 2 +- 9.0/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/8.0/Dockerfile b/8.0/Dockerfile index fbd4237..2d90f05 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -21,7 +21,7 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20151008 +ENV ODOO_RELEASE 20151215 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && dpkg --force-depends -i odoo.deb \ diff --git a/9.0/Dockerfile b/9.0/Dockerfile index 792a880..f479081 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -21,9 +21,9 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 9.0 -ENV ODOO_RELEASE 20151008 +ENV ODOO_RELEASE 20151215 RUN set -x; \ - curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}c.${ODOO_RELEASE}_all.deb \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From ad90fca59c9ac52f4f29a195535a3f8ebdddd30d Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Tue, 15 Dec 2015 14:27:20 +0100 Subject: [PATCH 02/25] Odoo: add checksum on odoo.deb download --- 8.0/Dockerfile | 1 + 9.0/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 2d90f05..7975543 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -24,6 +24,7 @@ ENV ODOO_VERSION 8.0 ENV ODOO_RELEASE 20151215 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo '8d3454047891074cc0805d30f11dd393831d69d8 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 f479081..b46e198 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -24,6 +24,7 @@ ENV ODOO_VERSION 9.0 ENV ODOO_RELEASE 20151215 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 'd3a246d44ff530cdfd494369030c1f095f00eb91 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From d5392866c185d52497fee5e2f6decbe99c416d9d Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Thu, 4 Feb 2016 11:10:03 +0100 Subject: [PATCH 03/25] Odoo: Update 8.0 and 9.0 to release 20160204 --- 8.0/Dockerfile | 4 ++-- 9.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 7975543..0f2ab3c 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20151215 +ENV ODOO_RELEASE 20160204 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '8d3454047891074cc0805d30f11dd393831d69d8 odoo.deb' | sha1sum -c - \ + && echo 'c19f6e7bba9b2e4dc4422398de8a3c20f2966749 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 b46e198..0b85d99 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 9.0 -ENV ODOO_RELEASE 20151215 +ENV ODOO_RELEASE 20160204 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 'd3a246d44ff530cdfd494369030c1f095f00eb91 odoo.deb' | sha1sum -c - \ + && echo '3633f30901619bfaeb12bb6cbb0de770856c5db6 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From f13ffb4c91febb2a2407a84a6fbe03b3ecdd51b5 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Thu, 24 Mar 2016 16:41:58 +0100 Subject: [PATCH 04/25] Odoo: Update 8.0 and 9.0 to release 20160324 --- 8.0/Dockerfile | 4 ++-- 9.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 0f2ab3c..37e97f1 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20160204 +ENV ODOO_RELEASE 20160324 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo 'c19f6e7bba9b2e4dc4422398de8a3c20f2966749 odoo.deb' | sha1sum -c - \ + && echo '75d3ab537092cd849892e4a12d6d15296fadd774 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 0b85d99..ed1bc36 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 9.0 -ENV ODOO_RELEASE 20160204 +ENV ODOO_RELEASE 20160324 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 '3633f30901619bfaeb12bb6cbb0de770856c5db6 odoo.deb' | sha1sum -c - \ + && echo '4d7f62fa22f05afc5b3a37c7220e481cb7c26c18 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From 57e968cee90fd65ec6bc5d838e6a92e368b613ff Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Thu, 28 Apr 2016 16:22:20 +0200 Subject: [PATCH 05/25] Odoo: Update 8.0 and 9.0 to release 20160428 --- 8.0/Dockerfile | 4 ++-- 9.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 37e97f1..c585d87 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20160324 +ENV ODOO_RELEASE 20160428 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '75d3ab537092cd849892e4a12d6d15296fadd774 odoo.deb' | sha1sum -c - \ + && echo 'f5109ed62235380304e8b953c60f5c0fa9c5c5cd 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 ed1bc36..028c114 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 9.0 -ENV ODOO_RELEASE 20160324 +ENV ODOO_RELEASE 20160428 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 '4d7f62fa22f05afc5b3a37c7220e481cb7c26c18 odoo.deb' | sha1sum -c - \ + && echo '21bf3b57ee83835f1c344335d44b8bc0a74e1fce odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From ee881ca4b80ee6dc504ba365c681a75c8c5a192d Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Thu, 9 Jun 2016 15:11:02 +0200 Subject: [PATCH 06/25] Odoo: Update 8.0 and 9.0 to release 20160609 --- 8.0/Dockerfile | 4 ++-- 9.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.0/Dockerfile b/8.0/Dockerfile index c585d87..4e3473c 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20160428 +ENV ODOO_RELEASE 20160609 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo 'f5109ed62235380304e8b953c60f5c0fa9c5c5cd odoo.deb' | sha1sum -c - \ + && echo 'd112d8f2c2f89fe9996d4142a22d58fc8fe79d63 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 028c114..db8ade9 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 9.0 -ENV ODOO_RELEASE 20160428 +ENV ODOO_RELEASE 20160609 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 '21bf3b57ee83835f1c344335d44b8bc0a74e1fce odoo.deb' | sha1sum -c - \ + && echo '56e7e5dc2525fd8c1522c05deb0f7f349a966260 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From b3d55d295954fed2c6101854f1b133340c05c767 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 26 Jul 2016 17:44:39 +0200 Subject: [PATCH 07/25] Odoo: Update 8.0 and 9.0 to release 20160726 --- 8.0/Dockerfile | 4 ++-- 9.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 4e3473c..974eb12 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20160609 +ENV ODOO_RELEASE 20160726 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo 'd112d8f2c2f89fe9996d4142a22d58fc8fe79d63 odoo.deb' | sha1sum -c - \ + && echo '6679fad48c761cf8587faa243afcfc17f5a9eb73 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 db8ade9..4ac60a4 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 9.0 -ENV ODOO_RELEASE 20160609 +ENV ODOO_RELEASE 20160726 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 '56e7e5dc2525fd8c1522c05deb0f7f349a966260 odoo.deb' | sha1sum -c - \ + && echo 'cbd0cbaed27da28eaae1c6460f36d398c8acbf77 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From 0fbea3c7340456c17d0dc6a4f747690c8d1bc695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Veikko=20Va=CC=88a=CC=88ta=CC=88ja=CC=88?= Date: Sat, 8 Oct 2016 19:02:43 +0200 Subject: [PATCH 08/25] [ADD] Odoo: 10.0 * Odoo version 10 created. Release 20161007. * Fixed old path. * Fixed startup command. * Changed to new naming convention and environment variables. Closes #75 --- 10.0/Dockerfile | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 10.0/entrypoint.sh | 24 +++++++++++++++++++++ 10.0/odoo.conf | 38 +++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 10.0/Dockerfile create mode 100755 10.0/entrypoint.sh create mode 100644 10.0/odoo.conf diff --git a/10.0/Dockerfile b/10.0/Dockerfile new file mode 100644 index 0000000..80652f8 --- /dev/null +++ b/10.0/Dockerfile @@ -0,0 +1,53 @@ +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-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 + +# Install Odoo +ENV ODOO_VERSION 10.0 +ENV ODOO_RELEASE 20161017 +RUN set -x; \ + curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo '98c40e7543a0204d1f4bf8ac7255451437fdbb04 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 new file mode 100755 index 0000000..fbb8f37 --- /dev/null +++ b/10.0/entrypoint.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +set -e + +# set odoo database host, port, user and password +: ${PGHOST:=$DB_PORT_5432_TCP_ADDR} +: ${PGPORT:=$DB_PORT_5432_TCP_PORT} +: ${PGUSER:=${DB_ENV_POSTGRES_USER:='postgres'}} +: ${PGPASSWORD:=$DB_ENV_POSTGRES_PASSWORD} +export PGHOST PGPORT PGUSER PGPASSWORD + +case "$1" in + --) + shift + exec odoo "$@" + ;; + -*) + exec odoo "$@" + ;; + *) + exec "$@" +esac + +exit 1 diff --git a/10.0/odoo.conf b/10.0/odoo.conf new file mode 100644 index 0000000..1518388 --- /dev/null +++ b/10.0/odoo.conf @@ -0,0 +1,38 @@ +[options] +addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/odoo/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 c4b4a8f242a0507b2b72ff38488eeea45ff0d7d9 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Tue, 25 Oct 2016 13:40:05 +0200 Subject: [PATCH 09/25] Odoo: Update 8.0, 9.0 and 10.0 to release 20161025 --- 10.0/Dockerfile | 4 ++-- 8.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 80652f8..3b210c8 100644 --- a/10.0/Dockerfile +++ b/10.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 10.0 -ENV ODOO_RELEASE 20161017 +ENV ODOO_RELEASE 20161025 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '98c40e7543a0204d1f4bf8ac7255451437fdbb04 odoo.deb' | sha1sum -c - \ + && echo 'e2376dc8efe0255c9c233b033d73a4766791960f odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 974eb12..e0add9b 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20160726 +ENV ODOO_RELEASE 20161025 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '6679fad48c761cf8587faa243afcfc17f5a9eb73 odoo.deb' | sha1sum -c - \ + && echo '6c43a1e2984266d257062b649676c6e327498c8c 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 4ac60a4..79d877b 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -21,10 +21,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 9.0 -ENV ODOO_RELEASE 20160726 +ENV ODOO_RELEASE 20161025 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 'cbd0cbaed27da28eaae1c6460f36d398c8acbf77 odoo.deb' | sha1sum -c - \ + && echo '126f7dc1de2f3c6faf3c4b5958c46ba628691fef odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From 0560419f9acf88d6a35b6749db4deaa26bd6a683 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Tue, 25 Oct 2016 15:20:46 +0200 Subject: [PATCH 10/25] [REF] Odoo 9.0, 10.0: remove node-clean-css dependency following https://github.com/odoo/odoo/commit/123e51f4d537b516729aef4f04dca944efdbea1b --- 10.0/Dockerfile | 1 - 9.0/Dockerfile | 1 - 2 files changed, 2 deletions(-) diff --git a/10.0/Dockerfile b/10.0/Dockerfile index 3b210c8..53d4fb9 100644 --- a/10.0/Dockerfile +++ b/10.0/Dockerfile @@ -8,7 +8,6 @@ RUN set -x; \ ca-certificates \ curl \ node-less \ - node-clean-css \ python-pyinotify \ python-renderpm \ python-support \ diff --git a/9.0/Dockerfile b/9.0/Dockerfile index 79d877b..9c4dc59 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -8,7 +8,6 @@ RUN set -x; \ ca-certificates \ curl \ node-less \ - node-clean-css \ python-pyinotify \ python-renderpm \ python-support \ From 6da3a1848f302d7c019b2bda44cd662ace304d97 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Tue, 25 Oct 2016 15:51:39 +0200 Subject: [PATCH 11/25] [REF] Odoo 8.0-10.0: install needed dependencies for worker mode ie python-gevent and psycogreen. As psycogreen is not packaged in debian jessie we have to install it with pip. As python-gevent is in the recommanded packaged of odoo and we don't install them, we install it explicitely. --- 10.0/Dockerfile | 5 ++++- 8.0/Dockerfile | 6 +++++- 9.0/Dockerfile | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/10.0/Dockerfile b/10.0/Dockerfile index 53d4fb9..ccf33b6 100644 --- a/10.0/Dockerfile +++ b/10.0/Dockerfile @@ -8,6 +8,8 @@ RUN set -x; \ ca-certificates \ curl \ node-less \ + python-gevent \ + python-pip \ python-pyinotify \ python-renderpm \ python-support \ @@ -16,7 +18,8 @@ RUN set -x; \ && 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 + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb \ + && pip install psycogreen==1.0 # Install Odoo ENV ODOO_VERSION 10.0 diff --git a/8.0/Dockerfile b/8.0/Dockerfile index e0add9b..ab7224d 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -9,6 +9,8 @@ RUN set -x; \ curl \ node-less \ node-clean-css \ + python-gevent \ + python-pip \ python-pyinotify \ python-renderpm \ python-support \ @@ -17,7 +19,9 @@ RUN set -x; \ && 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 + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb \ + && pip install psycogreen==1.0 + # Install Odoo ENV ODOO_VERSION 8.0 diff --git a/9.0/Dockerfile b/9.0/Dockerfile index 9c4dc59..81e72bd 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -8,6 +8,8 @@ RUN set -x; \ ca-certificates \ curl \ node-less \ + python-gevent \ + python-pip \ python-pyinotify \ python-renderpm \ python-support \ @@ -16,7 +18,8 @@ RUN set -x; \ && 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 + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb \ + && pip install psycogreen==1.0 # Install Odoo ENV ODOO_VERSION 9.0 From 9621c46392924e46e6ddd20c7c2da6429dbba624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Tue, 4 Oct 2016 17:33:51 -0500 Subject: [PATCH 12/25] [REF] Odoo 8.0-10.0: do not require linking environment variables The entry points of the Odoo docker images require the presence of the following environment variables: - DB_PORT_5432_TCP_ADDR - DB_PORT_5432_TCP_PORT - DB_ENV_POSTGRES_USER - DB_ENV_POSTGRES_PASSWORD We use them to set the PGHOST, PGPORT, PGUSER and PGPASSWORD environment variable that will then be read by Odoo in order to connect to the database server. As the first ones are automatically created by Docker when we use the linking system, it's not possible to run Odoo without the linking system and, for example, with Docker compose. In order to make it work with Docker compose and keep the backward compatibility with the linking system, we have to provide sane fallbacks to the assignation of the PGHOST, PGPORT, PGUSER and PGPASSWORD environment variable. We do that in this commit by defaulting the assignation of the postgres host to "db" and the port to "5432" because, if you follow our image documentation, that's what you get. We also introduce the handling of two others environment variable in the Odoo entry point: POSTGRES_USER and POSTGRES_PASSWORD. They will be used as fallbacks for DB_ENV_POSTGRES_USER and DB_ENV_POSTGRES_PASSWORD. --- 10.0/entrypoint.sh | 8 ++++---- 8.0/entrypoint.sh | 8 ++++---- 9.0/entrypoint.sh | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/10.0/entrypoint.sh b/10.0/entrypoint.sh index fbb8f37..c1e4ecb 100755 --- a/10.0/entrypoint.sh +++ b/10.0/entrypoint.sh @@ -3,10 +3,10 @@ set -e # set odoo database host, port, user and password -: ${PGHOST:=$DB_PORT_5432_TCP_ADDR} -: ${PGPORT:=$DB_PORT_5432_TCP_PORT} -: ${PGUSER:=${DB_ENV_POSTGRES_USER:='postgres'}} -: ${PGPASSWORD:=$DB_ENV_POSTGRES_PASSWORD} +: ${PGHOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PGPORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${PGUSER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} +: ${PGPASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} export PGHOST PGPORT PGUSER PGPASSWORD case "$1" in diff --git a/8.0/entrypoint.sh b/8.0/entrypoint.sh index 8ec01b4..ce41742 100755 --- a/8.0/entrypoint.sh +++ b/8.0/entrypoint.sh @@ -3,10 +3,10 @@ set -e # set odoo database host, port, user and password -: ${PGHOST:=$DB_PORT_5432_TCP_ADDR} -: ${PGPORT:=$DB_PORT_5432_TCP_PORT} -: ${PGUSER:=${DB_ENV_POSTGRES_USER:='postgres'}} -: ${PGPASSWORD:=$DB_ENV_POSTGRES_PASSWORD} +: ${PGHOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PGPORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${PGUSER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} +: ${PGPASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} export PGHOST PGPORT PGUSER PGPASSWORD case "$1" in diff --git a/9.0/entrypoint.sh b/9.0/entrypoint.sh index 8ec01b4..ce41742 100755 --- a/9.0/entrypoint.sh +++ b/9.0/entrypoint.sh @@ -3,10 +3,10 @@ set -e # set odoo database host, port, user and password -: ${PGHOST:=$DB_PORT_5432_TCP_ADDR} -: ${PGPORT:=$DB_PORT_5432_TCP_PORT} -: ${PGUSER:=${DB_ENV_POSTGRES_USER:='postgres'}} -: ${PGPASSWORD:=$DB_ENV_POSTGRES_PASSWORD} +: ${PGHOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PGPORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${PGUSER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} +: ${PGPASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} export PGHOST PGPORT PGUSER PGPASSWORD case "$1" in From a3d207f2d49c3a0eb0e959fbf2cb33909c382a3f Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Fri, 28 Oct 2016 15:15:57 +0200 Subject: [PATCH 13/25] [REF] Odoo 8.0-10.0: pass pg connection parameters as CLI arguments Do not assume that Odoo will handle correctly the PG* environment variables, because it won't. We also rename the PG* variables in order to avoid confusion since we do not export them anymore. --- 10.0/entrypoint.sh | 17 +++++++++-------- 8.0/entrypoint.sh | 17 +++++++++-------- 9.0/entrypoint.sh | 17 +++++++++-------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/10.0/entrypoint.sh b/10.0/entrypoint.sh index c1e4ecb..208c93d 100755 --- a/10.0/entrypoint.sh +++ b/10.0/entrypoint.sh @@ -2,20 +2,21 @@ set -e -# set odoo database host, port, user and password -: ${PGHOST:=${DB_PORT_5432_TCP_ADDR:='db'}} -: ${PGPORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${PGUSER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} -: ${PGPASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} -export PGHOST PGPORT PGUSER PGPASSWORD +# set the postgres database host, port, user and password +: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} +# pass them as arguments to the odoo process +DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) case "$1" in --) shift - exec odoo "$@" + exec odoo "${DB_ARGS[@]}" "$@" ;; -*) - exec odoo "$@" + exec odoo "${DB_ARGS[@]}" "$@" ;; *) exec "$@" diff --git a/8.0/entrypoint.sh b/8.0/entrypoint.sh index ce41742..85bc49b 100755 --- a/8.0/entrypoint.sh +++ b/8.0/entrypoint.sh @@ -2,20 +2,21 @@ set -e -# set odoo database host, port, user and password -: ${PGHOST:=${DB_PORT_5432_TCP_ADDR:='db'}} -: ${PGPORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${PGUSER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} -: ${PGPASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} -export PGHOST PGPORT PGUSER PGPASSWORD +# set the postgres database host, port, user and password +: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} +# pass them as arguments to the odoo process +DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) case "$1" in --) shift - exec openerp-server "$@" + exec openerp-server "${DB_ARGS[@]}" "$@" ;; -*) - exec openerp-server "$@" + exec openerp-server "${DB_ARGS[@]}" "$@" ;; *) exec "$@" diff --git a/9.0/entrypoint.sh b/9.0/entrypoint.sh index ce41742..85bc49b 100755 --- a/9.0/entrypoint.sh +++ b/9.0/entrypoint.sh @@ -2,20 +2,21 @@ set -e -# set odoo database host, port, user and password -: ${PGHOST:=${DB_PORT_5432_TCP_ADDR:='db'}} -: ${PGPORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${PGUSER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} -: ${PGPASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} -export PGHOST PGPORT PGUSER PGPASSWORD +# set the postgres database host, port, user and password +: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} +# pass them as arguments to the odoo process +DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) case "$1" in --) shift - exec openerp-server "$@" + exec openerp-server "${DB_ARGS[@]}" "$@" ;; -*) - exec openerp-server "$@" + exec openerp-server "${DB_ARGS[@]}" "$@" ;; *) exec "$@" From 13fba407e1e2cbd192760298f160f8f0f6f5665d Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Thu, 3 Nov 2016 11:42:54 +0100 Subject: [PATCH 14/25] [REF] Odoo 8.0-10.0: default USER and PASSWORD to odoo Defaulting USER to postgres does not make sense as odoo prevents creating a database with the user `postgres` (however, there's a bug that allows it when set by environment variable, but still it does not work later because Odoo does not use the environment variable to find the databases in the `list_dbs` method). Defaulting PASSWORD to odoo makes sense because it's what we set in the documentationm and is even mandatory since we chose to pass the pg connections parameters[1] and we did not set a default value for it. [1] a3d207f2d49c3a0eb0e959fbf2cb33909c382a3f --- 10.0/entrypoint.sh | 4 ++-- 8.0/entrypoint.sh | 4 ++-- 9.0/entrypoint.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/10.0/entrypoint.sh b/10.0/entrypoint.sh index 208c93d..3878702 100755 --- a/10.0/entrypoint.sh +++ b/10.0/entrypoint.sh @@ -5,8 +5,8 @@ set -e # set the postgres database host, port, user and password : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} -: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} # pass them as arguments to the odoo process DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) diff --git a/8.0/entrypoint.sh b/8.0/entrypoint.sh index 85bc49b..9765824 100755 --- a/8.0/entrypoint.sh +++ b/8.0/entrypoint.sh @@ -5,8 +5,8 @@ set -e # set the postgres database host, port, user and password : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} -: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} # pass them as arguments to the odoo process DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) diff --git a/9.0/entrypoint.sh b/9.0/entrypoint.sh index 85bc49b..9765824 100755 --- a/9.0/entrypoint.sh +++ b/9.0/entrypoint.sh @@ -5,8 +5,8 @@ set -e # set the postgres database host, port, user and password : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} -: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} +: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} +: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} # pass them as arguments to the odoo process DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) From ab612f290f3a802a617b66a308c179fb1b0fc1f9 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Thu, 3 Nov 2016 14:17:25 +0100 Subject: [PATCH 15/25] [FIX] Odoo 8.0-10.0: entrypoints: pass the pg parameters with CMD When nothing is passed as argument to the docker container, the entrypoint will receive the content of the CMD of the dockerfile. In this case we have to pass the database configuration arguments, else Odoo won't run correctly. This is the case when you run the command of our documentation: ``` docker run -p 8069:8069 --name odoo --link db:db -t odoo ``` However, it should still be possible to run custom command (like `ls /`). --- 10.0/entrypoint.sh | 2 +- 8.0/entrypoint.sh | 2 +- 9.0/entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/10.0/entrypoint.sh b/10.0/entrypoint.sh index 3878702..9fe792f 100755 --- a/10.0/entrypoint.sh +++ b/10.0/entrypoint.sh @@ -11,7 +11,7 @@ set -e DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) case "$1" in - --) + -- | odoo) shift exec odoo "${DB_ARGS[@]}" "$@" ;; diff --git a/8.0/entrypoint.sh b/8.0/entrypoint.sh index 9765824..50e82bc 100755 --- a/8.0/entrypoint.sh +++ b/8.0/entrypoint.sh @@ -11,7 +11,7 @@ set -e DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) case "$1" in - --) + -- | openerp-server) shift exec openerp-server "${DB_ARGS[@]}" "$@" ;; diff --git a/9.0/entrypoint.sh b/9.0/entrypoint.sh index 9765824..50e82bc 100755 --- a/9.0/entrypoint.sh +++ b/9.0/entrypoint.sh @@ -11,7 +11,7 @@ set -e DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) case "$1" in - --) + -- | openerp-server) shift exec openerp-server "${DB_ARGS[@]}" "$@" ;; From ea050e938ba153b39987a8a5d446210d8383aa46 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Thu, 3 Nov 2016 15:17:05 +0100 Subject: [PATCH 16/25] [REF] Odoo 8.0-10.0: update to release 20161103 --- 10.0/Dockerfile | 4 ++-- 8.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 ccf33b6..ea2b12e 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 20161025 +ENV ODOO_RELEASE 20161103 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo 'e2376dc8efe0255c9c233b033d73a4766791960f odoo.deb' | sha1sum -c - \ + && echo '298b9a3c752fbe8df1e6bc7e5ab9d84ce7d0061b odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index ab7224d..4327fd2 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -25,10 +25,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20161025 +ENV ODOO_RELEASE 20161103 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '6c43a1e2984266d257062b649676c6e327498c8c odoo.deb' | sha1sum -c - \ + && echo '1f0312e64731fd8f6c0d8bf9b3516ff1b13d01f2 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 81e72bd..aa80618 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 20161025 +ENV ODOO_RELEASE 20161103 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 '126f7dc1de2f3c6faf3c4b5958c46ba628691fef odoo.deb' | sha1sum -c - \ + && echo 'b5f88c06d8ba3475fa5ef15d93e504891c648f8e odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From 3a56e63ebf235d4b638750959d5c37d17d448a1a Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Thu, 3 Nov 2016 20:23:07 +0100 Subject: [PATCH 17/25] [ADD] gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..485dee6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea From bb4cc4584453bb6aa23cf075ce5ae25d8847d02b Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Thu, 3 Nov 2016 20:24:14 +0100 Subject: [PATCH 18/25] [ADD] Licence file closes #71 --- LICENSE | 859 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 859 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..12334e0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,859 @@ + +For copyright information, please see the COPYRIGHT file. + +Odoo is published under the GNU LESSER GENERAL PUBLIC LICENSE, Version 3 +(LGPLv3), as included below. Since the LGPL is a set of additional +permissions on top of the GPL, the text of the GPL is included at the +bottom as well. + +Some external libraries and contributions bundled with Odoo may be published +under other GPL-compatible licenses. For these, please refer to the relevant +source files and/or license files, in the source code tree. + +************************************************************************** + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + +************************************************************************** + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + + +************************************************************************** \ No newline at end of file From b8e9cd478a5e37db2584c7aa05eb98a3e48e4ab5 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Fri, 18 Nov 2016 14:39:46 +0100 Subject: [PATCH 19/25] [FIX] Odoo 8.0-10.0: override of config file pg credentials We tried to remove usage of environment variables to set the connection parameters to the postgres database but we omit the case when they're set in the config file related to a3d207f Fixes #80 --- 10.0/entrypoint.sh | 19 ++++++++++++++++--- 8.0/entrypoint.sh | 19 ++++++++++++++++--- 9.0/entrypoint.sh | 19 ++++++++++++++++--- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/10.0/entrypoint.sh b/10.0/entrypoint.sh index 9fe792f..576a165 100755 --- a/10.0/entrypoint.sh +++ b/10.0/entrypoint.sh @@ -2,13 +2,26 @@ set -e -# set the postgres database host, port, user and password +# 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'}}} -# pass them as arguments to the odoo process -DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) + +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) diff --git a/8.0/entrypoint.sh b/8.0/entrypoint.sh index 50e82bc..3e1ab0f 100755 --- a/8.0/entrypoint.sh +++ b/8.0/entrypoint.sh @@ -2,13 +2,26 @@ set -e -# set the postgres database host, port, user and password +# 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'}}} -# pass them as arguments to the odoo process -DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) + +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) diff --git a/9.0/entrypoint.sh b/9.0/entrypoint.sh index 50e82bc..3e1ab0f 100755 --- a/9.0/entrypoint.sh +++ b/9.0/entrypoint.sh @@ -2,13 +2,26 @@ set -e -# set the postgres database host, port, user and password +# 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'}}} -# pass them as arguments to the odoo process -DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT) + +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) From a2559e47d5bca392652f121ec24abb4348551def Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Fri, 18 Nov 2016 15:18:15 +0100 Subject: [PATCH 20/25] [FIX] Odoo 8.0-10.0: handling of odoo subcommand When using an Odoo subcommand, the name of this subcommand has to be in first position in the arguments list. Just pass the postgres config at the end of the command... except for the scaffold one. Fixes #83 --- 10.0/entrypoint.sh | 22 +++++++++++++--------- 8.0/entrypoint.sh | 22 +++++++++++++--------- 9.0/entrypoint.sh | 22 +++++++++++++--------- 3 files changed, 39 insertions(+), 27 deletions(-) diff --git a/10.0/entrypoint.sh b/10.0/entrypoint.sh index 576a165..4f0ef59 100755 --- a/10.0/entrypoint.sh +++ b/10.0/entrypoint.sh @@ -24,15 +24,19 @@ check_config "db_user" "$USER" check_config "db_password" "$PASSWORD" case "$1" in - -- | odoo) - shift - exec odoo "${DB_ARGS[@]}" "$@" - ;; - -*) - exec odoo "${DB_ARGS[@]}" "$@" - ;; - *) - exec "$@" + -- | 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/8.0/entrypoint.sh b/8.0/entrypoint.sh index 3e1ab0f..a958c3c 100755 --- a/8.0/entrypoint.sh +++ b/8.0/entrypoint.sh @@ -24,15 +24,19 @@ check_config "db_user" "$USER" check_config "db_password" "$PASSWORD" case "$1" in - -- | openerp-server) - shift - exec openerp-server "${DB_ARGS[@]}" "$@" - ;; - -*) - exec openerp-server "${DB_ARGS[@]}" "$@" - ;; - *) - exec "$@" + -- | 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/9.0/entrypoint.sh b/9.0/entrypoint.sh index 3e1ab0f..a958c3c 100755 --- a/9.0/entrypoint.sh +++ b/9.0/entrypoint.sh @@ -24,15 +24,19 @@ check_config "db_user" "$USER" check_config "db_password" "$PASSWORD" case "$1" in - -- | openerp-server) - shift - exec openerp-server "${DB_ARGS[@]}" "$@" - ;; - -*) - exec openerp-server "${DB_ARGS[@]}" "$@" - ;; - *) - exec "$@" + -- | 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 From d780e6fe363a65856dc1a36955fec6becdd2f41e Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Wed, 23 Nov 2016 11:59:12 +0100 Subject: [PATCH 21/25] [REF] Odoo 8.0-10.0: update to release 20161123 --- 10.0/Dockerfile | 4 ++-- 8.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 ea2b12e..083ffac 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 20161103 +ENV ODOO_RELEASE 20161123 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '298b9a3c752fbe8df1e6bc7e5ab9d84ce7d0061b odoo.deb' | sha1sum -c - \ + && echo '3c9edd6f1b5673c2a87fe65cfa5f404ef5f9c8e7 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 4327fd2..a3d2452 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -25,10 +25,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20161103 +ENV ODOO_RELEASE 20161123 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '1f0312e64731fd8f6c0d8bf9b3516ff1b13d01f2 odoo.deb' | sha1sum -c - \ + && echo 'fcc9fa35fae811958ee08a0f51dfc23242e755b6 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 aa80618..006dbce 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 20161103 +ENV ODOO_RELEASE 20161123 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 'b5f88c06d8ba3475fa5ef15d93e504891c648f8e odoo.deb' | sha1sum -c - \ + && echo 'c9e66e878146940ef188eaa8c9bc5da7e4306982 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From c97e82a93a71cccf0f40ffbe646b4115c359ea79 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Fri, 25 Nov 2016 16:30:50 +0100 Subject: [PATCH 22/25] [FIX] Odoo 9-10: `reload` handling We were still trying to make the auto reload feature work with the 8.0 way in the dockerfile 9 and 10. This patch install the dependency used in Odoo 9-10 (watchdog instead of pyinotify) and remove the "auto-reload" key from the default configuration file, as the new syntax is "--dev=reload". The auto-reload is now disabled by default (it didn't work, let's not bother someone that does not need it). The easiest way to use it is to pass the arguments to the odoo process as: docker run -p 8069:8069 --name odoo --link db:db -t odoo:[9.0|10.0] -- --dev=reload fixes #84 fixes #98 --- 10.0/Dockerfile | 2 +- 10.0/odoo.conf | 1 - 9.0/Dockerfile | 2 +- 9.0/openerp-server.conf | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/10.0/Dockerfile b/10.0/Dockerfile index 083ffac..417cc9f 100644 --- a/10.0/Dockerfile +++ b/10.0/Dockerfile @@ -10,9 +10,9 @@ RUN set -x; \ node-less \ python-gevent \ python-pip \ - python-pyinotify \ python-renderpm \ python-support \ + python-watchdog \ && 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 \ diff --git a/10.0/odoo.conf b/10.0/odoo.conf index 1518388..c3769ce 100644 --- a/10.0/odoo.conf +++ b/10.0/odoo.conf @@ -1,7 +1,6 @@ [options] addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/odoo/addons data_dir = /var/lib/odoo -auto_reload = True ; admin_passwd = admin ; csv_internal_sep = , ; db_maxconn = 64 diff --git a/9.0/Dockerfile b/9.0/Dockerfile index 006dbce..bf1739c 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -10,9 +10,9 @@ RUN set -x; \ node-less \ python-gevent \ python-pip \ - python-pyinotify \ python-renderpm \ python-support \ + python-watchdog \ && 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 \ diff --git a/9.0/openerp-server.conf b/9.0/openerp-server.conf index 0a1a0ed..8d9d297 100644 --- a/9.0/openerp-server.conf +++ b/9.0/openerp-server.conf @@ -1,7 +1,6 @@ [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 From f8af1a80b14d9e594fdef4df2ff78e655352473c Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Tue, 7 Feb 2017 16:37:07 +0100 Subject: [PATCH 23/25] [REF] Odoo 8.0-10.0: update to release 20170207 fixes #89 closes #101 --- 10.0/Dockerfile | 4 ++-- 8.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 417cc9f..11940ed 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 20161123 +ENV ODOO_RELEASE 20170207 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo '3c9edd6f1b5673c2a87fe65cfa5f404ef5f9c8e7 odoo.deb' | sha1sum -c - \ + && echo '5d2fb0cc03fa0795a7b2186bb341caa74d372e82 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index a3d2452..1c89245 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -25,10 +25,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20161123 +ENV ODOO_RELEASE 20170207 RUN set -x; \ curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo 'fcc9fa35fae811958ee08a0f51dfc23242e755b6 odoo.deb' | sha1sum -c - \ + && echo 'cd8c1dc9d2ddf5a538381eed85871a2e343ec8ae 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 bf1739c..7ef0c34 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 20161123 +ENV ODOO_RELEASE 20170207 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 'c9e66e878146940ef188eaa8c9bc5da7e4306982 odoo.deb' | sha1sum -c - \ + && echo '4ff504f4b2a49667a0bc8bbca95079305d8108c8 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From f432264ad15ce8e3326f281394e1900eb9d1c903 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 16 Aug 2017 11:01:50 +0200 Subject: [PATCH 24/25] [REF] Odoo 8.0-10.0: update to release 20170815 --- 10.0/Dockerfile | 4 ++-- 8.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 11940ed..f3ec734 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 20170207 +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 '5d2fb0cc03fa0795a7b2186bb341caa74d372e82 odoo.deb' | sha1sum -c - \ + && echo '08d21e6419a72be7a3ad784df7a6fc8a46bbe7d9 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 1c89245..a522102 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -25,10 +25,10 @@ RUN set -x; \ # Install Odoo ENV ODOO_VERSION 8.0 -ENV ODOO_RELEASE 20170207 +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 'cd8c1dc9d2ddf5a538381eed85871a2e343ec8ae odoo.deb' | sha1sum -c - \ + && echo '5835e966a07e5684b4f7bcc39585276b0bb68254 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 7ef0c34..2a8ecd6 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 20170207 +ENV ODOO_RELEASE 20170815 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 '4ff504f4b2a49667a0bc8bbca95079305d8108c8 odoo.deb' | sha1sum -c - \ + && echo '3d3b34cbbcd5f3fb739e85a2c855955322c0f328 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From 60b3f82cf1ccb05878b6ce7b470ea5ce80753745 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 13 Oct 2017 16:18:10 +0200 Subject: [PATCH 25/25] [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