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

[IMP] remove unneeded gosu from the Dockerfile

Browse Source
This commit is contained in:
Samus CTO 2015-03-02 15:19:43 +01:00 committed by Aaron Bohy
parent f000eeed23
commit 2b5021a8be
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
8.0/Dockerfile
View File

@ -18,14 +18,6 @@ RUN apt-get update \
&& apt-get -y install -f \ && apt-get -y install -f \
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
# Grab gosu for easy step-down from root
RUN gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \
&& curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \
&& gpg --verify /usr/local/bin/gosu.asc \
&& rm /usr/local/bin/gosu.asc \
&& chmod +x /usr/local/bin/gosu
# Install Odoo # Install Odoo
ENV ODOO_VERSION 8.0 ENV ODOO_VERSION 8.0
ENV ODOO_RELEASE 20141231 ENV ODOO_RELEASE 20141231
@ -35,11 +27,15 @@ 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
# Run script and Odoo configuration file # Copy run script and Odoo configuration file
COPY ./run.sh / COPY ./run.sh /
COPY ./openerp-server.conf /etc/odoo/ COPY ./openerp-server.conf /etc/odoo/
RUN chown odoo /etc/odoo/openerp-server.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
VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
# Set default user when running the container
USER odoo
ENTRYPOINT ["/run.sh"] ENTRYPOINT ["/run.sh"]

2
8.0/run.sh
View File

@ -9,4 +9,4 @@ export PGPASSWORD=$DB_ENV_POSTGRES_PASSWORD
[ "$1" != "--" ] && exec "$@" [ "$1" != "--" ] && exec "$@"
shift shift
exec gosu odoo /usr/bin/openerp-server --config=/etc/odoo/openerp-server.conf "$@" exec /usr/bin/openerp-server --config=/etc/odoo/openerp-server.conf "$@"