Open-Harbor/docker-odoo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Updating Dockerfile and entrypoint to mirror official 10.0 image

Browse Source
This commit is contained in:
Peter Alabaster 2016-10-19 10:11:23 +01:00
parent 9f955bb8a1
commit a88bdc159b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
10.0/Dockerfile
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 20161010 ENV ODOO_RELEASE 20161007
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 'cea0a08d253b97d289f3b0535b48f5a807b39522 odoo.deb' | sha1sum -c - \ && echo '1d7a801c9103167bfe7da0ae4191104992e16924 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 ./openerp-server.conf /etc/odoo/ COPY ./openerp-server.conf /etc/odoo/odoo.conf
RUN chown odoo /etc/odoo/openerp-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/openerp-server.conf ENV OPENERP_SERVER /etc/odoo/odoo.conf
# Set default user when running the container # Set default user when running the container
USER odoo USER odoo

4
10.0/entrypoint.sh
View File

@ -12,10 +12,10 @@ export PGHOST PGPORT PGUSER PGPASSWORD
case "$1" in case "$1" in
--) --)
shift shift
exec odoo "$@" exec odoo-bin "$@"
;; ;;
-*) -*)
exec odoo "$@" exec odoo-bin "$@"
;; ;;
*) *)
exec "$@" exec "$@"