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

Change to ENTRYPOINT + CMD

Browse Source 
The addition of `set -e` in the run.sh script exposed the fact that it was
erroring out when `$# -eq 0`.
This commit is contained in:
Mike Dillon 2015-03-10 17:46:12 -07:00
parent af052bedd7
commit 45bfe40dcb
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
8.0/Dockerfile
View File

@ -27,8 +27,8 @@ RUN curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odo
&& apt-get -y install -f --no-install-recommends \ && apt-get -y install -f --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* odoo.deb && rm -rf /var/lib/apt/lists/* odoo.deb
# Copy run script and Odoo configuration file # Copy entrypoint script and Odoo configuration file
COPY ./run.sh / COPY ./entrypoint.sh /
COPY ./openerp-server.conf /etc/odoo/ COPY ./openerp-server.conf /etc/odoo/
RUN chown odoo /etc/odoo/openerp-server.conf RUN chown odoo /etc/odoo/openerp-server.conf
@ -41,4 +41,5 @@ EXPOSE 8069 8071
# Set default user when running the container # Set default user when running the container
USER odoo USER odoo
ENTRYPOINT ["/run.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["/usr/bin/openerp-server", "--config=/etc/odoo/openerp-server.conf"]

5
8.0/run.sh → 8.0/entrypoint.sh
View File

@ -9,7 +9,4 @@ set -e
: ${PGPASSWORD:=$DB_ENV_POSTGRES_PASSWORD} : ${PGPASSWORD:=$DB_ENV_POSTGRES_PASSWORD}
export PGHOST PGPORT PGUSER PGPASSWORD export PGHOST PGPORT PGUSER PGPASSWORD
[ "$1" != "--" ] && exec "$@" exec "$@"
shift
exec /usr/bin/openerp-server --config=/etc/odoo/openerp-server.conf "$@"