Merged changes from odoo/docker.
This commit is contained in:
Veikko Väätäjä
commit
8599dd7d09
@ -1,5 +1,5 @@
|
||||
FROM debian:jessie
|
||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
||||
LABEL maintainer="Odoo S.A. <info@odoo.com>"
|
||||
|
||||
# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
|
||||
RUN set -x; \
|
||||
@ -7,26 +7,43 @@ RUN set -x; \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
dirmngr \
|
||||
node-less \
|
||||
python-gevent \
|
||||
python-ldap \
|
||||
python-pip \
|
||||
python-qrcode \
|
||||
python-renderpm \
|
||||
python-support \
|
||||
python-vobject \
|
||||
python-watchdog \
|
||||
&& 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 - \
|
||||
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.jessie_amd64.deb \
|
||||
&& echo '4d104ff338dc2d2083457b3b1e9baab8ddf14202 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
|
||||
|
||||
# install latest postgresql-client
|
||||
RUN set -x; \
|
||||
echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' > etc/apt/sources.list.d/pgdg.list \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
|
||||
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
|
||||
&& gpg --armor --export "${repokey}" | apt-key add - \
|
||||
&& rm -rf "$GNUPGHOME" \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y postgresql-client \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Odoo
|
||||
ENV ODOO_VERSION 10.0
|
||||
ENV ODOO_RELEASE 20181204
|
||||
ARG ODOO_RELEASE=20190128
|
||||
ARG ODOO_SHA=673bb5e45c006c9a822a0ca1a7d19989c03151ad
|
||||
RUN set -x; \
|
||||
curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||
&& echo 'c31e92a42772529b922c6ed9574e5538c3bd6959 odoo.deb' | sha1sum -c - \
|
||||
curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||
&& echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
|
||||
&& dpkg --force-depends -i odoo.deb \
|
||||
&& apt-get update \
|
||||
&& apt-get -y install -f --no-install-recommends \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
FROM debian:stretch
|
||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
||||
LABEL maintainer="Odoo S.A. <info@odoo.com>"
|
||||
|
||||
# Generate locale C.UTF-8 for postgres and general locale data
|
||||
ENV LANG C.UTF-8
|
||||
@ -10,26 +10,45 @@ RUN set -x; \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
dirmngr \
|
||||
fonts-noto-cjk \
|
||||
gnupg \
|
||||
libssl1.0-dev \
|
||||
node-less \
|
||||
python3-pip \
|
||||
python3-setuptools \
|
||||
python3-pyldap \
|
||||
python3-qrcode \
|
||||
python3-renderpm \
|
||||
libssl1.0-dev \
|
||||
xz-utils \
|
||||
python3-setuptools \
|
||||
python3-vobject \
|
||||
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/
|
||||
xz-utils \
|
||||
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
|
||||
&& echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
|
||||
&& dpkg --force-depends -i wkhtmltox.deb\
|
||||
&& apt-get -y install -f --no-install-recommends \
|
||||
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb
|
||||
|
||||
# install latest postgresql-client
|
||||
RUN set -x; \
|
||||
echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
|
||||
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
|
||||
&& gpg --armor --export "${repokey}" | apt-key add - \
|
||||
&& gpgconf --kill all \
|
||||
&& rm -rf "$GNUPGHOME" \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y postgresql-client \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Odoo
|
||||
ENV ODOO_VERSION 11.0
|
||||
ENV ODOO_RELEASE 20181204
|
||||
ARG ODOO_RELEASE=20190128
|
||||
ARG ODOO_SHA=30cb83ce38ec0b4a459e5590407cb2f9dcf46061
|
||||
RUN set -x; \
|
||||
curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||
&& echo '2f18604a2b5686ef408facb31c2d1afabaac8537 odoo.deb' | sha1sum -c - \
|
||||
curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||
&& echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
|
||||
&& dpkg --force-depends -i odoo.deb \
|
||||
&& apt-get update \
|
||||
&& apt-get -y install -f --no-install-recommends \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
FROM debian:stretch
|
||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
||||
LABEL maintainer="Odoo S.A. <info@odoo.com>"
|
||||
|
||||
# Generate locale C.UTF-8 for postgres and general locale data
|
||||
ENV LANG C.UTF-8
|
||||
@ -10,26 +10,59 @@ RUN set -x; \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
dirmngr \
|
||||
fonts-noto-cjk \
|
||||
gnupg \
|
||||
libssl1.0-dev \
|
||||
node-less \
|
||||
python3-pip \
|
||||
python3-setuptools \
|
||||
python3-pyldap \
|
||||
python3-qrcode \
|
||||
python3-renderpm \
|
||||
libssl1.0-dev \
|
||||
xz-utils \
|
||||
python3-setuptools \
|
||||
python3-vobject \
|
||||
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/
|
||||
xz-utils \
|
||||
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
|
||||
&& echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
|
||||
&& dpkg --force-depends -i wkhtmltox.deb\
|
||||
&& apt-get -y install -f --no-install-recommends \
|
||||
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb
|
||||
|
||||
# install latest postgresql-client
|
||||
RUN set -x; \
|
||||
echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
|
||||
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
|
||||
&& gpg --armor --export "${repokey}" | apt-key add - \
|
||||
&& gpgconf --kill all \
|
||||
&& rm -rf "$GNUPGHOME" \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y postgresql-client \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install rtlcss (on Debian stretch)
|
||||
RUN set -x;\
|
||||
echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \
|
||||
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
|
||||
&& gpg --armor --export "${repokey}" | apt-key add - \
|
||||
&& gpgconf --kill all \
|
||||
&& rm -rf "$GNUPGHOME" \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y nodejs \
|
||||
&& npm install -g rtlcss \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Odoo
|
||||
ENV ODOO_VERSION 12.0
|
||||
ENV ODOO_RELEASE 20181204
|
||||
ARG ODOO_RELEASE=20190128
|
||||
ARG ODOO_SHA=9e34aaed2eb1e7697aaf36767247dbf335e9fe7a
|
||||
RUN set -x; \
|
||||
curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||
&& echo 'dc3ea90b0a6321d63a1db05b41d7b126085d4bd6 odoo.deb' | sha1sum -c - \
|
||||
curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||
&& echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
|
||||
&& dpkg --force-depends -i odoo.deb \
|
||||
&& apt-get update \
|
||||
&& apt-get -y install -f --no-install-recommends \
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
FROM debian:jessie
|
||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
||||
|
||||
# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
|
||||
RUN set -x; \
|
||||
apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
node-less \
|
||||
python-gevent \
|
||||
python-pip \
|
||||
python-renderpm \
|
||||
python-support \
|
||||
python-watchdog \
|
||||
&& 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
|
||||
|
||||
# Install Odoo
|
||||
ENV ODOO_VERSION 9.0
|
||||
ENV ODOO_RELEASE 20180808
|
||||
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 '25f90d98509484bc4b54174ccb814dd96ddb797b 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
|
||||
COPY ./entrypoint.sh /
|
||||
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
|
||||
RUN mkdir -p /mnt/extra-addons \
|
||||
&& chown -R odoo /mnt/extra-addons
|
||||
VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
|
||||
|
||||
# Expose Odoo services
|
||||
EXPOSE 8069 8071
|
||||
|
||||
# Set the default config file
|
||||
ENV OPENERP_SERVER /etc/odoo/openerp-server.conf
|
||||
|
||||
# Set default user when running the container
|
||||
USER odoo
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
CMD ["openerp-server"]
|
||||
@ -1,42 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
# set the postgres database host, port, user and password according to the environment
|
||||
# and pass them as arguments to the odoo process if not present in the config file
|
||||
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
|
||||
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
|
||||
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
|
||||
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
|
||||
|
||||
DB_ARGS=()
|
||||
function check_config() {
|
||||
param="$1"
|
||||
value="$2"
|
||||
if ! grep -q -E "^\s*\b${param}\b\s*=" "$OPENERP_SERVER" ; then
|
||||
DB_ARGS+=("--${param}")
|
||||
DB_ARGS+=("${value}")
|
||||
fi;
|
||||
}
|
||||
check_config "db_host" "$HOST"
|
||||
check_config "db_port" "$PORT"
|
||||
check_config "db_user" "$USER"
|
||||
check_config "db_password" "$PASSWORD"
|
||||
|
||||
case "$1" in
|
||||
-- | openerp-server)
|
||||
shift
|
||||
if [[ "$1" == "scaffold" ]] ; then
|
||||
exec openerp-server "$@"
|
||||
else
|
||||
exec openerp-server "$@" "${DB_ARGS[@]}"
|
||||
fi
|
||||
;;
|
||||
-*)
|
||||
exec openerp-server "$@" "${DB_ARGS[@]}"
|
||||
;;
|
||||
*)
|
||||
exec "$@"
|
||||
esac
|
||||
|
||||
exit 1
|
||||
@ -1,37 +0,0 @@
|
||||
[options]
|
||||
addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/openerp/addons
|
||||
data_dir = /var/lib/odoo
|
||||
; admin_passwd = admin
|
||||
; csv_internal_sep = ,
|
||||
; db_maxconn = 64
|
||||
; db_name = False
|
||||
; db_template = template1
|
||||
; dbfilter = .*
|
||||
; debug_mode = False
|
||||
; email_from = False
|
||||
; limit_memory_hard = 2684354560
|
||||
; limit_memory_soft = 2147483648
|
||||
; limit_request = 8192
|
||||
; limit_time_cpu = 60
|
||||
; limit_time_real = 120
|
||||
; list_db = True
|
||||
; log_db = False
|
||||
; log_handler = [':INFO']
|
||||
; log_level = info
|
||||
; logfile = None
|
||||
; longpolling_port = 8072
|
||||
; max_cron_threads = 2
|
||||
; osv_memory_age_limit = 1.0
|
||||
; osv_memory_count_limit = False
|
||||
; smtp_password = False
|
||||
; smtp_port = 25
|
||||
; smtp_server = localhost
|
||||
; smtp_ssl = False
|
||||
; smtp_user = False
|
||||
; workers = 0
|
||||
; xmlrpc = True
|
||||
; xmlrpc_interface =
|
||||
; xmlrpc_port = 8069
|
||||
; xmlrpcs = True
|
||||
; xmlrpcs_interface =
|
||||
; xmlrpcs_port = 8071
|
||||
Loading…
Reference in New Issue
Block a user