Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Odoo: 20170207 releases #2631

Merged
merged 1 commit into from
Feb 7, 2017
Merged

Odoo: 20170207 releases #2631

merged 1 commit into from
Feb 7, 2017

Conversation

sle-odoo
Copy link
Contributor

@sle-odoo sle-odoo commented Feb 7, 2017

Hello,
This pull request updates the Odoo releases with the latest nightlies and fixes a dependency issue.

Thanks in advance

@yosifkit
Copy link
Member

yosifkit commented Feb 7, 2017

diff --git a/odoo_8/Dockerfile b/odoo_8/Dockerfile
index a3d2452..1c89245 100644
--- a/odoo_8/Dockerfile
+++ b/odoo_8/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/odoo_9/Dockerfile b/odoo_9/Dockerfile
index 006dbce..7ef0c34 100644
--- a/odoo_9/Dockerfile
+++ b/odoo_9/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 \
@@ -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 \
diff --git a/odoo_9/openerp-server.conf b/odoo_9/openerp-server.conf
index 0a1a0ed..8d9d297 100644
--- a/odoo_9/openerp-server.conf
+++ b/odoo_9/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
diff --git a/odoo_latest/Dockerfile b/odoo_latest/Dockerfile
index 083ffac..11940ed 100644
--- a/odoo_latest/Dockerfile
+++ b/odoo_latest/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 \
@@ -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/odoo_latest/odoo.conf b/odoo_latest/odoo.conf
index 1518388..c3769ce 100644
--- a/odoo_latest/odoo.conf
+++ b/odoo_latest/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

@tianon
Copy link
Member

tianon commented Feb 7, 2017

Build test of #2631; a4c0e6d (odoo):
warning: insecure protocol git:// detected: git://github.com/odoo/docker

$ bashbrew build odoo:8.0
Building bashbrew/cache:447b5845250d2929bb07cb2217f5d7c4d941ed668fee7498927fd3d881057a9e (odoo:8.0)
Tagging odoo:8.0
Tagging odoo:8

$ test/run.sh odoo:8.0
testing odoo:8.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build odoo:9.0
Building bashbrew/cache:e24e457305195586e9029315664f93245872fcad5a006148bfd820287124fa16 (odoo:9.0)
Tagging odoo:9.0
Tagging odoo:9

$ test/run.sh odoo:9.0
testing odoo:9.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build odoo:10.0
Building bashbrew/cache:ccaa9954d085aa77ad0dfd106c6512c159016f83fa5347f8d8ed1a8b62145212 (odoo:10.0)
Tagging odoo:10.0
Tagging odoo:10
Tagging odoo:latest

$ test/run.sh odoo:10.0
testing odoo:10.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit cf51645 into docker-library:master Feb 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants