diff options
| author | Nicolas Martinelli <nim@odoo.com> | 2015-02-20 14:55:49 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-02-23 08:24:24 +0100 |
| commit | c8c84d4a4eb8e98086ee16a19fde8e8615b2e926 (patch) | |
| tree | 5276b1232a0cb8a5918bc67fb92594abd397eaad | |
| parent | 5b3812d84b0eb9f272518738498b44292671be1e (diff) | |
[IMP] Packaging: use docker image of debian jessie.
Update to pip v6 necessary to avoid import error of 'IncompleteRead' from requests.compat
| -rw-r--r-- | setup/package.dfdebian | 2 | ||||
| -rw-r--r-- | setup/package.dfsrc | 4 | ||||
| -rwxr-xr-x | setup/package.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/setup/package.dfdebian b/setup/package.dfdebian index 7a96a560792..ef1232ac51c 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -1,6 +1,6 @@ # Please note that this Dockerfile is used for testing nightly builds and should # not be used to deploy Odoo -FROM debian:stable +FROM debian:jessie MAINTAINER Odoo S.A. <info@odoo.com> # Change policy-rc.d so that services start automatically once installed diff --git a/setup/package.dfsrc b/setup/package.dfsrc index 3b1f4cdfd09..20408633ad8 100644 --- a/setup/package.dfsrc +++ b/setup/package.dfsrc @@ -1,6 +1,6 @@ # Please note that this Dockerfile is used for testing nightly builds and should # not be used to deploy Odoo -FROM debian:stable +FROM debian:jessie MAINTAINER Odoo S.A. <info@odoo.com> # Change policy-rc.d so that services start automatically once installed @@ -35,6 +35,8 @@ RUN apt-get update -qq && \ python -y && \ rm -rf /var/lib/apt/lists/* +RUN pip install --upgrade pip + COPY requirements.txt /opt/release/requirements.txt RUN pip install -r /opt/release/requirements.txt diff --git a/setup/package.py b/setup/package.py index 17668545847..e00f8bac3d0 100755 --- a/setup/package.py +++ b/setup/package.py @@ -318,7 +318,7 @@ def test_tgz(o): with docker('odoo-%s-src-nightly-tests' % version, o.build_dir, o.pub) as wheezy: wheezy.release = '*.tar.gz' wheezy.system("service postgresql start") - wheezy.system('/usr/local/bin/pip install /opt/release/%s' % wheezy.release) + wheezy.system('pip install /opt/release/%s' % wheezy.release) wheezy.system("useradd --system --no-create-home odoo") wheezy.system('su postgres -s /bin/bash -c "createuser -s odoo"') wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"') |