diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-07-16 11:21:22 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-07-16 11:21:22 +0200 |
| commit | 1510a81366958ecb87376f36d0e7cbca99a5c1c5 (patch) | |
| tree | 7be4c09b97f4d81ad6b13541a0dbc7e7f92a836d /setup | |
| parent | 1240e2ae880476afa0dff911bf0513e62713ed46 (diff) | |
| parent | 9ac62d76bb119892c979fc9fa8f7449cdedc8cb9 (diff) | |
[MERGE] forward port of branch 8.0 up to 9ac62d7
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/package.dfdebian | 3 | ||||
| -rw-r--r-- | setup/package.dfsrc | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/setup/package.dfdebian b/setup/package.dfdebian index ef1232ac51c..85a019d64cd 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -3,9 +3,6 @@ FROM debian:jessie MAINTAINER Odoo S.A. <info@odoo.com> -# Change policy-rc.d so that services start automatically once installed -RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d - RUN apt-get update && \ apt-get install -y locales && \ rm -rf /var/lib/apt/lists/* diff --git a/setup/package.dfsrc b/setup/package.dfsrc index 20408633ad8..6b6c06efbf9 100644 --- a/setup/package.dfsrc +++ b/setup/package.dfsrc @@ -3,9 +3,6 @@ FROM debian:jessie MAINTAINER Odoo S.A. <info@odoo.com> -# Change policy-rc.d so that services start automatically once installed -RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d - RUN apt-get update && \ apt-get install -y locales && \ rm -rf /var/lib/apt/lists/* @@ -33,6 +30,7 @@ RUN apt-get update -qq && \ python-pip \ build-essential \ python -y && \ + easy_install --upgrade pip && \ rm -rf /var/lib/apt/lists/* RUN pip install --upgrade pip |