fix odoo setup
This commit is contained in:
parent
453cae1724
commit
a39d59e119
|
@ -2,12 +2,6 @@ version: "3.6"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
odoo14:
|
odoo14:
|
||||||
environment:
|
|
||||||
ADDITIONAL_ODOO_RC: |-
|
|
||||||
encryption_key=local.localhost
|
|
||||||
[ir.config_parameter]
|
|
||||||
report.url=http://odoo.local.localhost
|
|
||||||
web.base.url=http://odoo.local.localhost
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- kwkhtmltopdf
|
- kwkhtmltopdf
|
||||||
kwkhtmltopdf:
|
kwkhtmltopdf:
|
||||||
|
|
|
@ -18,7 +18,6 @@ services:
|
||||||
target: ${DOCKER_BUILD_TARGET}
|
target: ${DOCKER_BUILD_TARGET}
|
||||||
environment:
|
environment:
|
||||||
- ADDITIONAL_ODOO_RC=${ODOO14_ADDITIONAL_ODOO_RC}
|
- ADDITIONAL_ODOO_RC=${ODOO14_ADDITIONAL_ODOO_RC}
|
||||||
- ADDONS_PATH=${ODOO14_ADDONS_PATH:-\$ADDONS_PATH}
|
|
||||||
- ADMIN_PASSWD=${ODOO14_ADMIN_PASSWD}
|
- ADMIN_PASSWD=${ODOO14_ADMIN_PASSWD}
|
||||||
- DB_HOST=${ODOO14_DB_HOST}
|
- DB_HOST=${ODOO14_DB_HOST}
|
||||||
- DB_NAME=${ODOO14_DB_NAME}
|
- DB_NAME=${ODOO14_DB_NAME}
|
||||||
|
@ -30,12 +29,12 @@ services:
|
||||||
- MARABUNTA_ALLOW_SERIE=${ODOO14_MARABUNTA_ALLOW_SERIE:-True}
|
- MARABUNTA_ALLOW_SERIE=${ODOO14_MARABUNTA_ALLOW_SERIE:-True}
|
||||||
- MARABUNTA_FORCE_VERSION=${ODOO14_MARABUNTA_FORCE_VERSION}
|
- MARABUNTA_FORCE_VERSION=${ODOO14_MARABUNTA_FORCE_VERSION}
|
||||||
- MARABUNTA_MODE=${ODOO14_MARABUNTA_MODE:-demo}
|
- MARABUNTA_MODE=${ODOO14_MARABUNTA_MODE:-demo}
|
||||||
- MAX_CRON_THREADS=${ODOO14_MAX_CRON_THREADS}
|
- MAX_CRON_THREADS=${ODOO14_MAX_CRON_THREADS:-2}
|
||||||
- ODOO_BASE_URL=${ODOO14_ODOO_BASE_URL}
|
- ODOO_BASE_URL=${ODOO14_ODOO_BASE_URL}
|
||||||
- ODOO_QUEUE_JOB_CHANNELS=${ODOO14_ODOO_QUEUE_JOB_CHANNELS}
|
- ODOO_QUEUE_JOB_CHANNELS=${ODOO14_ODOO_QUEUE_JOB_CHANNELS:-root:1}
|
||||||
- ODOO_REPORT_URL=${ODOO14_ODOO_REPORT_URL}
|
- ODOO_REPORT_URL=${ODOO14_ODOO_REPORT_URL}
|
||||||
- RUNNING_ENV=${ODOO14_RUNNING_ENV:-dev}
|
- RUNNING_ENV=${ODOO14_RUNNING_ENV:-dev}
|
||||||
- SERVER_WIDE_MODULES=${ODOO14_SERVER_WIDE_MODULES}
|
- SERVER_WIDE_MODULES=${ODOO14_SERVER_WIDE_MODULES:-web}
|
||||||
- WORKERS=${ODOO14_WORKERS:-0}
|
- WORKERS=${ODOO14_WORKERS:-0}
|
||||||
networks:
|
networks:
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -e
|
||||||
|
|
||||||
mkdir -p /opt/odoo/etc
|
mkdir -p /opt/odoo/etc
|
||||||
envsubst < /opt/odoo/odoo.conf.tpl > /opt/odoo/etc/odoo.conf
|
envsubst < /opt/odoo/odoo.conf.tpl > /opt/odoo/etc/odoo.conf
|
||||||
|
|
||||||
export PGHOST=${DB_HOST}
|
export PGHOST="${DB_HOST:-db}"
|
||||||
export PGPORT=${DB_PORT:-5432}
|
export PGPORT="${DB_PORT:-5432}"
|
||||||
export PGUSER=${DB_USER}
|
export PGUSER="${DB_USER:-odoo}"
|
||||||
export PGPASSWORD=${DB_PASSWORD}
|
export PGPASSWORD="${DB_PASSWORD:-odoo}"
|
||||||
export PGDATABASE=${DB_NAME}
|
export PGDATABASE="${DB_NAME:-odoo}"
|
||||||
|
|
||||||
mkdir -p /data/odoo/{addons,filestore,sessions}
|
mkdir -p /data/odoo/{addons,filestore,sessions}
|
||||||
if [ ! "$(stat -c '%U' /data/odoo)" = "odoo" ]; then
|
if [ ! "$(stat -c '%U' /data/odoo)" = "odoo" ]; then
|
||||||
|
@ -18,33 +18,38 @@ fi
|
||||||
BASE_CMD=$(basename $1)
|
BASE_CMD=$(basename $1)
|
||||||
if [ "$BASE_CMD" = "odoo" ] || [ "$BASE_CMD" = "odoo.py" ] || [ "$BASE_CMD" = "odoo-bin" ] || [ "$BASE_CMD" = "openerp-server" ] ; then
|
if [ "$BASE_CMD" = "odoo" ] || [ "$BASE_CMD" = "odoo.py" ] || [ "$BASE_CMD" = "odoo-bin" ] || [ "$BASE_CMD" = "openerp-server" ] ; then
|
||||||
|
|
||||||
|
# wait db
|
||||||
|
while ! psql -l -h "$DB_HOST" -U "$DB_USER" >/dev/null 2>&1; do
|
||||||
|
count="$(( ${count:-0}+1 ))"
|
||||||
|
[ "${count}" -eq "${DB_WAIT:-24}" ] && echo "Unable to connect to db host: $DB_HOST" && exit 1
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
# create db
|
# create db
|
||||||
if ! psql -lqtA -h $DB_HOST -U $DB_USER | grep -q "^$DB_NAME|"; then
|
if ! psql -lqtA -h "$DB_HOST" -U "$DB_USER" | grep -q "^$DB_NAME|"; then
|
||||||
createdb -h $DB_HOST -U $DB_USER -O $DB_USER $DB_NAME
|
createdb -h "$DB_HOST" -U "$DB_USER" -O "$DB_USER" "$DB_NAME"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# update db
|
# update db
|
||||||
MARABUNTA_DB_HOST=$DB_HOST \
|
MARABUNTA_DB_HOST="$DB_HOST" \
|
||||||
MARABUNTA_DATABASE=$DB_NAME \
|
MARABUNTA_DATABASE="$DB_NAME" \
|
||||||
MARABUNTA_DB_USER=$DB_USER \
|
MARABUNTA_DB_USER="$DB_USER" \
|
||||||
MARABUNTA_DB_PASSWORD=$DB_PASSWORD \
|
MARABUNTA_DB_PASSWORD="$DB_PASSWORD" \
|
||||||
MARABUNTA_DB_PORT=$DB_PORT \
|
MARABUNTA_DB_PORT="$DB_PORT" \
|
||||||
unbuffer marabunta --migration-file /opt/odoo/migration.yml
|
unbuffer marabunta --migration-file /opt/odoo/migration.yml
|
||||||
|
|
||||||
ENTRYPOINT_DIR=/opt/odoo/entrypoint.d
|
ENTRYPOINT_DIR=/opt/odoo/entrypoint.d
|
||||||
if [ -d "$ENTRYPOINT_DIR" ]; then
|
if [ -d "$ENTRYPOINT_DIR" ]; then
|
||||||
if [ -z "${NOGOSU:-}" ] ; then
|
if [ -z "${NOGOSU:-}" ] ; then
|
||||||
gosu odoo run-parts --verbose "$ENTRYPOINT_DIR"
|
gosu odoo run-parts "$ENTRYPOINT_DIR"
|
||||||
else
|
else
|
||||||
run-parts --verbose "$ENTRYPOINT_DIR"
|
run-parts "$ENTRYPOINT_DIR"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "${NOGOSU:-}" ] ; then
|
if [ -z "${NOGOSU:-}" ] ; then
|
||||||
echo "Running $@ with UID $USER_ID"
|
|
||||||
exec gosu odoo "$@"
|
exec gosu odoo "$@"
|
||||||
else
|
else
|
||||||
echo "Running $@"
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -9,9 +9,7 @@
|
||||||
"depends": [
|
"depends": [
|
||||||
"base",
|
"base",
|
||||||
"l10n_fr",
|
"l10n_fr",
|
||||||
"account_financial_report",
|
|
||||||
"contacts",
|
"contacts",
|
||||||
"products",
|
|
||||||
"sale",
|
"sale",
|
||||||
"server_environment_ir_config_parameter",
|
"server_environment_ir_config_parameter",
|
||||||
"server_environment_data_encryption",
|
"server_environment_data_encryption",
|
||||||
|
|
|
@ -1,8 +1,12 @@
|
||||||
migration:
|
migration:
|
||||||
options:
|
options:
|
||||||
install_command: odoo --without-demo=${WITHOUT_DEMO:-True} -d odoo14 -i web,base_librezo --stop-after-init
|
install_command: odoo --without-demo=${WITHOUT_DEMO:-True}
|
||||||
versions:
|
versions:
|
||||||
- version: setup
|
- version: setup
|
||||||
operations:
|
operations:
|
||||||
pre:
|
pre:
|
||||||
- 'sh -c ''psql -c "CREATE EXTENSION pg_trgm;"'''
|
- 'sh -c ''psql -c "CREATE EXTENSION pg_trgm;"'''
|
||||||
|
addons:
|
||||||
|
upgrade:
|
||||||
|
- base_librezo
|
||||||
|
- web
|
||||||
|
|
Loading…
Reference in New Issue