From 943f39a3ac64ac81c4e33e6e1a2034747793cedb 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:04 +0200 Subject: [PATCH 1/5] Update 8.0 and 9.0 to release 20161007 --- 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 974eb12..14614e9 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 20161007 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 '73c528c6b41c144337c77825d4263ec59d342469 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..69882c3 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 20161007 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 '80e3b87a73b1c3d08e000c46c6ac9ea8831a60ae odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ From 6550a2b59a2f4c1abf10cb7a608f6f75e1afb163 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 2/5] Odoo version 10 created. Release 20161007. --- 10.0/Dockerfile | 53 +++++++++++++++++++++++++++++++++++++++++++ 10.0/entrypoint.sh | 24 ++++++++++++++++++++ 10.0/odoo-server.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-server.conf diff --git a/10.0/Dockerfile b/10.0/Dockerfile new file mode 100644 index 0000000..5eb83fe --- /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 20161007 +RUN set -x; \ + curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo '1d7a801c9103167bfe7da0ae4191104992e16924 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-server.conf /etc/odoo/ +RUN chown odoo /etc/odoo/odoo-server.conf + +# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons +RUN mkdir -p /mnt/extra-addons \ + && chown -R odoo /mnt/extra-addons +VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] + +# Expose Odoo services +EXPOSE 8069 8071 + +# Set the default config file +ENV OPENERP_SERVER /etc/odoo/odoo-server.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..c404ac1 --- /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-bin "$@" + ;; + -*) + exec odoo-bin "$@" + ;; + *) + exec "$@" +esac + +exit 1 diff --git a/10.0/odoo-server.conf b/10.0/odoo-server.conf new file mode 100644 index 0000000..0a1a0ed --- /dev/null +++ b/10.0/odoo-server.conf @@ -0,0 +1,38 @@ +[options] +addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/openerp/addons +data_dir = /var/lib/odoo +auto_reload = True +; admin_passwd = admin +; csv_internal_sep = , +; db_maxconn = 64 +; db_name = False +; db_template = template1 +; dbfilter = .* +; debug_mode = False +; email_from = False +; limit_memory_hard = 2684354560 +; limit_memory_soft = 2147483648 +; limit_request = 8192 +; limit_time_cpu = 60 +; limit_time_real = 120 +; list_db = True +; log_db = False +; log_handler = [':INFO'] +; log_level = info +; logfile = None +; longpolling_port = 8072 +; max_cron_threads = 2 +; osv_memory_age_limit = 1.0 +; osv_memory_count_limit = False +; smtp_password = False +; smtp_port = 25 +; smtp_server = localhost +; smtp_ssl = False +; smtp_user = False +; workers = 0 +; xmlrpc = True +; xmlrpc_interface = +; xmlrpc_port = 8069 +; xmlrpcs = True +; xmlrpcs_interface = +; xmlrpcs_port = 8071 From 91541321de9c773ffc6aa6bec90351c64fe2bf4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Veikko=20Va=CC=88a=CC=88ta=CC=88ja=CC=88?= Date: Mon, 10 Oct 2016 14:33:31 +0300 Subject: [PATCH 3/5] Fixed old path. --- 10.0/odoo-server.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/10.0/odoo-server.conf b/10.0/odoo-server.conf index 0a1a0ed..1518388 100644 --- a/10.0/odoo-server.conf +++ b/10.0/odoo-server.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/openerp/addons +addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/odoo/addons data_dir = /var/lib/odoo auto_reload = True ; admin_passwd = admin From ca3ae976b3df9a131c2bbf05143c8f28879fa09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Veikko=20Va=CC=88a=CC=88ta=CC=88ja=CC=88?= Date: Mon, 10 Oct 2016 14:39:53 +0300 Subject: [PATCH 4/5] Fixed startup command. --- 10.0/entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/10.0/entrypoint.sh b/10.0/entrypoint.sh index c404ac1..fbb8f37 100755 --- a/10.0/entrypoint.sh +++ b/10.0/entrypoint.sh @@ -12,10 +12,10 @@ export PGHOST PGPORT PGUSER PGPASSWORD case "$1" in --) shift - exec odoo-bin "$@" + exec odoo "$@" ;; -*) - exec odoo-bin "$@" + exec odoo "$@" ;; *) exec "$@" From 4347666a2cbd0c76fc20cef61decef10b41a9c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Veikko=20Va=CC=88a=CC=88ta=CC=88ja=CC=88?= Date: Mon, 17 Oct 2016 11:24:10 +0300 Subject: [PATCH 5/5] Changed to new naming convention and environment variables. Updated to a newer nightly release. --- 10.0/Dockerfile | 10 +++++----- 10.0/{odoo-server.conf => odoo.conf} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename 10.0/{odoo-server.conf => odoo.conf} (100%) diff --git a/10.0/Dockerfile b/10.0/Dockerfile index 5eb83fe..80652f8 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 20161007 +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 '1d7a801c9103167bfe7da0ae4191104992e16924 odoo.deb' | sha1sum -c - \ + && echo '98c40e7543a0204d1f4bf8ac7255451437fdbb04 odoo.deb' | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ && apt-get -y install -f --no-install-recommends \ @@ -32,8 +32,8 @@ RUN set -x; \ # Copy entrypoint script and Odoo configuration file COPY ./entrypoint.sh / -COPY ./odoo-server.conf /etc/odoo/ -RUN chown odoo /etc/odoo/odoo-server.conf +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 \ @@ -44,7 +44,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] EXPOSE 8069 8071 # Set the default config file -ENV OPENERP_SERVER /etc/odoo/odoo-server.conf +ENV ODOO_RC /etc/odoo/odoo.conf # Set default user when running the container USER odoo diff --git a/10.0/odoo-server.conf b/10.0/odoo.conf similarity index 100% rename from 10.0/odoo-server.conf rename to 10.0/odoo.conf