[FIX] Dockerfile fixed according to Moghedrin review
This commit is contained in:
parent
a517d19b14
commit
89f8e90878
@ -1,36 +1,33 @@
|
|||||||
FROM debian:wheezy
|
FROM debian:wheezy
|
||||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
MAINTAINER Odoo S.A. <info@odoo.com>
|
||||||
|
|
||||||
RUN apt-get update && \
|
# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
|
||||||
apt-get install -y \
|
RUN apt-get update \
|
||||||
ca-certificates \
|
&& apt-get install -y \
|
||||||
wget && \
|
ca-certificates \
|
||||||
rm -rf /var/lib/apt/lists/*
|
wget \
|
||||||
|
adduser \
|
||||||
# Install lessc and less-plugin-clean-css
|
python-support \
|
||||||
RUN wget -O - https://deb.nodesource.com/setup | bash -
|
&& wget -O - https://deb.nodesource.com/setup | bash - \
|
||||||
RUN apt-get -y install nodejs
|
&& apt-get -y install nodejs \
|
||||||
RUN npm install -g less less-plugin-clean-css
|
&& 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 \
|
||||||
# Install wkhtmltopdf
|
&& dpkg --force-depends -i wkhtmltox-0.12.1_linux-wheezy-amd64.deb \
|
||||||
RUN wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1_linux-wheezy-amd64.deb && \
|
&& apt-get -y install -f \
|
||||||
dpkg --force-depends -i wkhtmltox-0.12.1_linux-wheezy-amd64.deb && \
|
&& rm -f 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_VERSION 8.0
|
||||||
ENV ODOO_RELEASE 20141209
|
ENV ODOO_RELEASE 20141209
|
||||||
|
|
||||||
# Install Odoo
|
# Install Odoo
|
||||||
RUN apt-get -y install adduser python-support && \
|
RUN wget http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||||
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 \
|
||||||
dpkg --force-depends -i odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb && \
|
&& apt-get -y install -f --no-install-recommends \
|
||||||
apt-get -y install -f --no-install-recommends && \
|
&& rm -f odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb
|
||||||
rm -f odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb
|
|
||||||
|
|
||||||
# Retrieve Odoo public key, add Odoo nightly to repo list for further updates
|
# 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 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
|
&& echo "deb http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/ ./" >> /etc/apt/sources.list
|
||||||
|
|
||||||
# Run script
|
# Run script
|
||||||
COPY run.sh /run.sh
|
COPY run.sh /run.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user