Merge branch 'master' into testing_improvements

This commit is contained in:
Colin Newell 2016-03-10 10:07:54 +00:00
commit a5a21b8d18
2 changed files with 5 additions and 3 deletions

View File

@ -36,9 +36,10 @@ RUN set -x; \
# Install Odoo
ENV ODOO_VERSION 8.0
ENV ODOO_RELEASE 20151008
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 'c19f6e7bba9b2e4dc4422398de8a3c20f2966749 odoo.deb' | sha1sum -c - \
&& dpkg --force-depends -i odoo.deb \
&& apt-get update \
&& apt-get -y install -f --no-install-recommends \

View File

@ -21,9 +21,10 @@ RUN set -x; \
# Install Odoo
ENV ODOO_VERSION 9.0
ENV ODOO_RELEASE 20151008
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 \
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 - \
&& dpkg --force-depends -i odoo.deb \
&& apt-get update \
&& apt-get -y install -f --no-install-recommends \