Lithin T
GitHub
commit
91a6780e44
@ -23,10 +23,10 @@ RUN set -x; \
|
||||
|
||||
# Install Odoo
|
||||
ENV ODOO_VERSION 10.0
|
||||
ENV ODOO_RELEASE 20170815
|
||||
ENV ODOO_RELEASE 20180710
|
||||
RUN set -x; \
|
||||
curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||
&& echo '08d21e6419a72be7a3ad784df7a6fc8a46bbe7d9 odoo.deb' | sha1sum -c - \
|
||||
&& echo '5aa056fa00a2f405652ba1386807c59ae563af29 odoo.deb' | sha1sum -c - \
|
||||
&& dpkg --force-depends -i odoo.deb \
|
||||
&& apt-get update \
|
||||
&& apt-get -y install -f --no-install-recommends \
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
FROM debian:jessie
|
||||
FROM debian:stretch
|
||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
||||
|
||||
# Generate locale C.UTF-8 for postgres and general locale data
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
|
||||
RUN set -x; \
|
||||
apt-get update \
|
||||
@ -8,36 +11,35 @@ RUN set -x; \
|
||||
ca-certificates \
|
||||
curl \
|
||||
node-less \
|
||||
node-clean-css \
|
||||
python-gevent \
|
||||
python-pip \
|
||||
python-pyinotify \
|
||||
python-renderpm \
|
||||
python-support \
|
||||
&& curl -o wkhtmltox.deb -SL http://nightly.odoo.com/extra/wkhtmltox-0.12.1.2_linux-jessie-amd64.deb \
|
||||
&& echo '40e8b906de658a2221b15e4e8cd82565a47d7ee8 wkhtmltox.deb' | sha1sum -c - \
|
||||
&& dpkg --force-depends -i wkhtmltox.deb \
|
||||
&& apt-get -y install -f --no-install-recommends \
|
||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false npm \
|
||||
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb \
|
||||
&& pip install psycogreen==1.0
|
||||
|
||||
python3-pip \
|
||||
python3-setuptools \
|
||||
python3-renderpm \
|
||||
libssl1.0-dev \
|
||||
xz-utils \
|
||||
python3-watchdog \
|
||||
&& curl -o wkhtmltox.tar.xz -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \
|
||||
&& echo '3f923f425d345940089e44c1466f6408b9619562 wkhtmltox.tar.xz' | sha1sum -c - \
|
||||
&& tar xvf wkhtmltox.tar.xz \
|
||||
&& cp wkhtmltox/lib/* /usr/local/lib/ \
|
||||
&& cp wkhtmltox/bin/* /usr/local/bin/ \
|
||||
&& cp -r wkhtmltox/share/man/man1 /usr/local/share/man/
|
||||
|
||||
# Install Odoo
|
||||
ENV ODOO_VERSION 8.0
|
||||
ENV ODOO_RELEASE 20170815
|
||||
ENV ODOO_VERSION 11.0
|
||||
ENV ODOO_RELEASE 20180710
|
||||
RUN set -x; \
|
||||
curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||
&& echo '5835e966a07e5684b4f7bcc39585276b0bb68254 odoo.deb' | sha1sum -c - \
|
||||
&& echo 'b843864476bb149d1b5715b7fa3ef726b3658d6a odoo.deb' | sha1sum -c - \
|
||||
&& dpkg --force-depends -i odoo.deb \
|
||||
&& apt-get update \
|
||||
&& apt-get -y install -f --no-install-recommends \
|
||||
&& rm -rf /var/lib/apt/lists/* odoo.deb
|
||||
|
||||
# Copy entrypoint script and Odoo configuration file
|
||||
RUN pip3 install num2words xlwt
|
||||
COPY ./entrypoint.sh /
|
||||
COPY ./openerp-server.conf /etc/odoo/
|
||||
RUN chown odoo /etc/odoo/openerp-server.conf
|
||||
COPY ./odoo.conf /etc/odoo/
|
||||
RUN chown odoo /etc/odoo/odoo.conf
|
||||
|
||||
# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
|
||||
RUN mkdir -p /mnt/extra-addons \
|
||||
@ -48,10 +50,10 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
|
||||
EXPOSE 8069 8071
|
||||
|
||||
# Set the default config file
|
||||
ENV OPENERP_SERVER /etc/odoo/openerp-server.conf
|
||||
ENV ODOO_RC /etc/odoo/odoo.conf
|
||||
|
||||
# Set default user when running the container
|
||||
USER odoo
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
CMD ["openerp-server"]
|
||||
CMD ["odoo"]
|
||||
@ -13,7 +13,7 @@ DB_ARGS=()
|
||||
function check_config() {
|
||||
param="$1"
|
||||
value="$2"
|
||||
if ! grep -q -E "^\s*\b${param}\b\s*=" "$OPENERP_SERVER" ; then
|
||||
if ! grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then
|
||||
DB_ARGS+=("--${param}")
|
||||
DB_ARGS+=("${value}")
|
||||
fi;
|
||||
@ -24,16 +24,16 @@ check_config "db_user" "$USER"
|
||||
check_config "db_password" "$PASSWORD"
|
||||
|
||||
case "$1" in
|
||||
-- | openerp-server)
|
||||
-- | odoo)
|
||||
shift
|
||||
if [[ "$1" == "scaffold" ]] ; then
|
||||
exec openerp-server "$@"
|
||||
exec odoo "$@"
|
||||
else
|
||||
exec openerp-server "$@" "${DB_ARGS[@]}"
|
||||
exec odoo "$@" "${DB_ARGS[@]}"
|
||||
fi
|
||||
;;
|
||||
-*)
|
||||
exec openerp-server "$@" "${DB_ARGS[@]}"
|
||||
exec odoo "$@" "${DB_ARGS[@]}"
|
||||
;;
|
||||
*)
|
||||
exec "$@"
|
||||
@ -1,7 +1,6 @@
|
||||
[options]
|
||||
addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/openerp/addons
|
||||
addons_path = /mnt/extra-addons
|
||||
data_dir = /var/lib/odoo
|
||||
auto_reload = True
|
||||
; admin_passwd = admin
|
||||
; csv_internal_sep = ,
|
||||
; db_maxconn = 64
|
||||
@ -23,10 +23,10 @@ RUN set -x; \
|
||||
|
||||
# Install Odoo
|
||||
ENV ODOO_VERSION 9.0
|
||||
ENV ODOO_RELEASE 20170815
|
||||
ENV ODOO_RELEASE 20180710
|
||||
RUN set -x; \
|
||||
curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}c.${ODOO_RELEASE}_all.deb \
|
||||
&& echo '3d3b34cbbcd5f3fb739e85a2c855955322c0f328 odoo.deb' | sha1sum -c - \
|
||||
&& echo '79ec48555a83507ba8956f4bb25840f5c033178a odoo.deb' | sha1sum -c - \
|
||||
&& dpkg --force-depends -i odoo.deb \
|
||||
&& apt-get update \
|
||||
&& apt-get -y install -f --no-install-recommends \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user