Merge branch 'master' into testing_improvements
This commit is contained in:
commit
a5a21b8d18
@ -36,9 +36,10 @@ RUN set -x; \
|
|||||||
|
|
||||||
# Install Odoo
|
# Install Odoo
|
||||||
ENV ODOO_VERSION 8.0
|
ENV ODOO_VERSION 8.0
|
||||||
ENV ODOO_RELEASE 20151008
|
ENV ODOO_RELEASE 20160204
|
||||||
RUN set -x; \
|
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}.${ODOO_RELEASE}_all.deb \
|
||||||
|
&& echo 'c19f6e7bba9b2e4dc4422398de8a3c20f2966749 odoo.deb' | sha1sum -c - \
|
||||||
&& dpkg --force-depends -i odoo.deb \
|
&& dpkg --force-depends -i odoo.deb \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get -y install -f --no-install-recommends \
|
&& apt-get -y install -f --no-install-recommends \
|
||||||
|
@ -21,9 +21,10 @@ RUN set -x; \
|
|||||||
|
|
||||||
# Install Odoo
|
# Install Odoo
|
||||||
ENV ODOO_VERSION 9.0
|
ENV ODOO_VERSION 9.0
|
||||||
ENV ODOO_RELEASE 20151008
|
ENV ODOO_RELEASE 20160204
|
||||||
RUN set -x; \
|
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 \
|
&& dpkg --force-depends -i odoo.deb \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get -y install -f --no-install-recommends \
|
&& apt-get -y install -f --no-install-recommends \
|
||||||
|
Loading…
Reference in New Issue
Block a user