[FIX] Dockerfile fixed according to Moghedrin review

This commit is contained in:
Aaron Bohy 2014-12-11 11:26:49 +01:00
parent a517d19b14
commit 89f8e90878

View File

@ -1,36 +1,33 @@
FROM debian:wheezy
MAINTAINER Odoo S.A. <info@odoo.com>
RUN apt-get update && \
apt-get install -y \
# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
RUN apt-get update \
&& apt-get install -y \
ca-certificates \
wget && \
rm -rf /var/lib/apt/lists/*
# Install lessc and less-plugin-clean-css
RUN wget -O - https://deb.nodesource.com/setup | bash -
RUN apt-get -y install nodejs
RUN npm install -g less less-plugin-clean-css
# Install wkhtmltopdf
RUN wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1_linux-wheezy-amd64.deb && \
dpkg --force-depends -i wkhtmltox-0.12.1_linux-wheezy-amd64.deb && \
apt-get -y install -f && \
rm -f wkhtmltox-0.12.1_linux-wheezy-amd64.deb
wget \
adduser \
python-support \
&& wget -O - https://deb.nodesource.com/setup | bash - \
&& apt-get -y install nodejs \
&& npm install -g less less-plugin-clean-css \
&& wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1_linux-wheezy-amd64.deb \
&& dpkg --force-depends -i wkhtmltox-0.12.1_linux-wheezy-amd64.deb \
&& apt-get -y install -f \
&& rm -f wkhtmltox-0.12.1_linux-wheezy-amd64.deb
ENV ODOO_VERSION 8.0
ENV ODOO_RELEASE 20141209
# Install Odoo
RUN apt-get -y install adduser python-support && \
wget http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb && \
dpkg --force-depends -i odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb && \
apt-get -y install -f --no-install-recommends && \
rm -f odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb
RUN wget http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
&& dpkg --force-depends -i odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
&& apt-get -y install -f --no-install-recommends \
&& rm -f odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb
# Retrieve Odoo public key, add Odoo nightly to repo list for further updates
RUN wget -O - https://nightly.odoo.com/odoo.key | apt-key add -
RUN echo "deb http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/ ./" >> /etc/apt/sources.list
RUN wget -O - https://nightly.odoo.com/odoo.key | apt-key add - \
&& echo "deb http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/ ./" >> /etc/apt/sources.list
# Run script
COPY run.sh /run.sh