Changed to new naming convention and environment variables. Updated to a newer nightly release.

This commit is contained in:
Veikko Väätäjä 2016-10-17 11:24:10 +03:00
parent ca3ae976b3
commit 4347666a2c
2 changed files with 5 additions and 5 deletions

View File

@ -21,10 +21,10 @@ RUN set -x; \
# Install Odoo # Install Odoo
ENV ODOO_VERSION 10.0 ENV ODOO_VERSION 10.0
ENV ODOO_RELEASE 20161007 ENV ODOO_RELEASE 20161017
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 '1d7a801c9103167bfe7da0ae4191104992e16924 odoo.deb' | sha1sum -c - \ && echo '98c40e7543a0204d1f4bf8ac7255451437fdbb04 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 \
@ -32,8 +32,8 @@ RUN set -x; \
# Copy entrypoint script and Odoo configuration file # Copy entrypoint script and Odoo configuration file
COPY ./entrypoint.sh / COPY ./entrypoint.sh /
COPY ./odoo-server.conf /etc/odoo/ COPY ./odoo.conf /etc/odoo/
RUN chown odoo /etc/odoo/odoo-server.conf RUN chown odoo /etc/odoo/odoo.conf
# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons # Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
RUN mkdir -p /mnt/extra-addons \ RUN mkdir -p /mnt/extra-addons \
@ -44,7 +44,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
EXPOSE 8069 8071 EXPOSE 8069 8071
# Set the default config file # Set the default config file
ENV OPENERP_SERVER /etc/odoo/odoo-server.conf ENV ODOO_RC /etc/odoo/odoo.conf
# Set default user when running the container # Set default user when running the container
USER odoo USER odoo