From cd6cc4cfd8b4bd5767ea34c6fd97e2c825f933bc Mon Sep 17 00:00:00 2001 From: Yann Autissier Date: Thu, 24 Mar 2022 01:42:55 +0000 Subject: [PATCH] auto installed modules --- .env.dist | 11 +++- docker/docker-compose.app.yml | 18 +++++- docker/docker-compose.db.yml | 23 -------- docker/docker-compose.local.yml | 8 --- docker/docker-compose.postgres.yml | 24 ++++++++ docker/docker-compose.yml | 10 ++-- docker/odoo14/Dockerfile | 60 ++++++++++--------- docker/odoo14/docker-entrypoint.sh | 67 ++++++++++++---------- .../base_librezo/__init__.py | 0 .../base_librezo/__manifest__.py | 17 ++++-- extra-requirements.txt | 25 ++++++++ librezo-addons/requirements.txt | 22 ------- migration.yml | 2 +- docker/odoo14/odoo.conf.tpl => odoo.conf.tpl | 5 +- 14 files changed, 166 insertions(+), 126 deletions(-) delete mode 100644 docker/docker-compose.db.yml delete mode 100644 docker/docker-compose.local.yml create mode 100644 docker/docker-compose.postgres.yml rename {librezo-addons => extra-addons}/base_librezo/__init__.py (100%) rename {librezo-addons => extra-addons}/base_librezo/__manifest__.py (69%) create mode 100644 extra-requirements.txt delete mode 100644 librezo-addons/requirements.txt rename docker/odoo14/odoo.conf.tpl => odoo.conf.tpl (89%) diff --git a/.env.dist b/.env.dist index f3bf7d9..4681b27 100644 --- a/.env.dist +++ b/.env.dist @@ -5,16 +5,21 @@ APP_PATH=${ENV_SUFFIX} APP_SCHEME=http APP_URI=${APP_HOST}/${APP_PATH} APP_URL=${APP_SCHEME}://${APP_URI} -DOCKER=false ENV=dist ODOO14_ADDITIONAL_ODOO_RC=encryption_key=${APP_DOMAIN} ODOO14_ADMIN_PASSWD=admin ODOO14_DB_HOST=postgres -ODOO14_DB_NAME=odoo14 +ODOO14_DB_NAME=librezo ODOO14_DB_PASSWORD=odoo ODOO14_DB_USER=odoo +ODOO14_LIST_DB=true +ODOO14_MODULES_AUTO_INSTALL_DISABLED=partner_autocomplete,iap,mail_bot,account_edi,account_edi_facturx,account_edi_ubl +ODOO14_MODULES_AUTO_INSTALL_ENABLED=account_menu,base_technical_features,disable_odoo_online,web_no_bubble,web_responsive ODOO14_ODOO_BASE_URL=${APP_URL} ODOO14_ODOO_REPORT_URL=${APP_URL} -ODOO14_SERVER_WIDE_MODULES=web +ODOO14_SERVER_WIDE_MODULES=web,module_change_auto_install ODOO14_SERVICE_8069_TAGS=urlprefix-${APP_URI} ODOO14_SERVICE_8072_TAGS=urlprefix-${APP_URI}longpolling/ +POSTGRES_DB=${ODOO14_DB_NAME} +POSTGRES_PASSWORD=${ODOO14_DB_PASSWORD} +POSTGRES_USER=${ODOO14_DB_USER} diff --git a/docker/docker-compose.app.yml b/docker/docker-compose.app.yml index 1f8540b..ffb01f1 100644 --- a/docker/docker-compose.app.yml +++ b/docker/docker-compose.app.yml @@ -1,7 +1,21 @@ version: "3.6" services: + kwkhtmltopdf: + image: acsone/kwkhtmltopdf odoo14: + depends_on: + - postgres + - kwkhtmltopdf ports: - - 8169:8069 - - 8172:8072 + - 8069:8069 + - 8070:8070 + - 8071:8071 + - 8072:8072 + postgres: + extends: + file: docker-compose.postgres.yml + service: postgres + +volumes: + postgres: diff --git a/docker/docker-compose.db.yml b/docker/docker-compose.db.yml deleted file mode 100644 index 3007f1b..0000000 --- a/docker/docker-compose.db.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: "3.6" - -services: - db: - environment: - - POSTGRES_USER=odoo - - POSTGRES_DB=odoo14 - image: quay.io/akretion/postgresql:10 - networks: - private: - volumes: - - db:/var/lib/postgresql/data - ports: - - 5432 - restart: always - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - -volumes: - db: diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml deleted file mode 100644 index b110d90..0000000 --- a/docker/docker-compose.local.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: "3.6" - -services: - odoo14: - depends_on: - - kwkhtmltopdf - kwkhtmltopdf: - image: acsone/kwkhtmltopdf diff --git a/docker/docker-compose.postgres.yml b/docker/docker-compose.postgres.yml new file mode 100644 index 0000000..2f0d1a0 --- /dev/null +++ b/docker/docker-compose.postgres.yml @@ -0,0 +1,24 @@ +version: "3.6" + +services: + postgres: + environment: + - POSTGRES_DB=${POSTGRES_DB:-odoo14} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-odoo} + - POSTGRES_USER=${POSTGRES_USER:-odoo} + image: postgres:10 + networks: + private: + volumes: + - postgres:/var/lib/postgresql/data + ports: + - 5432 + restart: always + +networks: + private: + external: true + name: ${DOCKER_NETWORK_PRIVATE} + +volumes: + postgres: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 801a262..ac47168 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -19,22 +19,26 @@ services: environment: - ADDITIONAL_ODOO_RC=${ODOO14_ADDITIONAL_ODOO_RC} - ADMIN_PASSWD=${ODOO14_ADMIN_PASSWD} + - DBFILTER=${ODOO14_DBFILTER:-^.*$} - DB_HOST=${ODOO14_DB_HOST} - DB_NAME=${ODOO14_DB_NAME} - DB_PASSWORD=${ODOO14_DB_PASSWORD} - DB_USER=${ODOO14_DB_USER} + - LIST_DB=${ODOO14_LIST_DB:-False} - LOG_DB=${ODOO14_LOG_DB:-False} - LOG_HANDLER=${ODOO14_LOG_HANDLER:-:INFO} - LOG_LEVEL=${ODOO14_LOG_LEVEL:-info} - MARABUNTA_ALLOW_SERIE=${ODOO14_MARABUNTA_ALLOW_SERIE:-True} - MARABUNTA_FORCE_VERSION=${ODOO14_MARABUNTA_FORCE_VERSION} - MARABUNTA_MODE=${ODOO14_MARABUNTA_MODE:-demo} - - MAX_CRON_THREADS=${ODOO14_MAX_CRON_THREADS:-2} + - MAX_CRON_THREADS=${ODOO14_MAX_CRON_THREADS:-1} + - MODULES_AUTO_INSTALL_DISABLED=${ODOO14_MODULES_AUTO_INSTALL_DISABLED} + - MODULES_AUTO_INSTALL_ENABLED=${ODOO14_MODULES_AUTO_INSTALL_ENABLED} - ODOO_BASE_URL=${ODOO14_ODOO_BASE_URL} - ODOO_QUEUE_JOB_CHANNELS=${ODOO14_ODOO_QUEUE_JOB_CHANNELS:-root:1} - ODOO_REPORT_URL=${ODOO14_ODOO_REPORT_URL} - RUNNING_ENV=${ODOO14_RUNNING_ENV:-dev} - - SERVER_WIDE_MODULES=${ODOO14_SERVER_WIDE_MODULES:-web} + - SERVER_WIDE_MODULES=${ODOO14_SERVER_WIDE_MODULES:-base,web} - WORKERS=${ODOO14_WORKERS:-0} networks: private: @@ -43,8 +47,6 @@ services: - 8072 volumes: - odoo14:/data/odoo - - odoo14-cache:/odoo/.cache volumes: odoo14: - odoo14-cache: diff --git a/docker/odoo14/Dockerfile b/docker/odoo14/Dockerfile index beb61e7..0517d03 100644 --- a/docker/odoo14/Dockerfile +++ b/docker/odoo14/Dockerfile @@ -1,9 +1,11 @@ -FROM python:3.8-alpine as dist +ARG PYTHON_RELEASE=3.8 +FROM python:${PYTHON_RELEASE}-alpine as dist LABEL maintainer aynic.os ARG DOCKER_BUILD_DIR=. ARG ODOO_REMOTE=https://github.com/odoo/odoo ARG ODOO_VERSION=14.0 +ARG PYTHON_RELEASE=3.8 RUN apk add --no-cache --virtual .build-deps \ g++ \ @@ -18,17 +20,17 @@ RUN apk add --no-cache --virtual .build-deps \ musl-dev \ openldap-dev \ && ln -s /usr/lib/libldap.so /usr/lib/libldap_r.so \ - && /usr/local/bin/python3.8 -m venv /opt/odoo \ - && /opt/odoo/bin/pip3.8 install -U pip wheel \ + && /usr/local/bin/python${PYTHON_RELEASE} -m venv /opt/odoo \ + && /opt/odoo/bin/pip${PYTHON_RELEASE} install -U pip wheel \ && wget -qO - ${ODOO_REMOTE}/archive/refs/heads/${ODOO_VERSION}.tar.gz |tar --strip-components 1 -C /opt/odoo -xzf - \ - && /opt/odoo/bin/pip3.8 install -r /opt/odoo/requirements.txt /opt/odoo \ - && rm -rf /root/.cache /opt/odoo/build/* /opt/odoo/odoo/* \ + && /opt/odoo/bin/pip${PYTHON_RELEASE} install -r /opt/odoo/requirements.txt /opt/odoo \ + && rm -rf /root/.cache /opt/odoo/build /opt/odoo/odoo \ && apk del --no-network .build-deps \ && find /opt/odoo/lib -type f -executable \ -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ | sort -u \ - | awk 'system("[ -e /lib/"$1" -o -e /usr/lib/"$1" -o -e /opt/odoo/lib/python3.8/site-packages/*/"$1" ]") == 0 { next } { print "so:" $1 }' \ + | awk 'system("[ -e /lib/"$1" -o -e /usr/lib/"$1" -o -e /opt/odoo/lib/python'"${PYTHON_RELEASE}"'/site-packages/*/"$1" ]") == 0 { next } { print "so:" $1 }' \ | xargs -rt apk add --no-cache RUN wget -qO /usr/local/bin/wkhtmltopdf https://raw.githubusercontent.com/acsone/kwkhtmltopdf/master/client/python/kwkhtmltopdf_client.py \ @@ -42,19 +44,17 @@ RUN apk add --repository https://dl-cdn.alpinelinux.org/alpine/edge/testing \ expect \ postgresql-client -COPY ${DOCKER_BUILD_DIR}/odoo.conf.tpl /opt/odoo/ COPY ${DOCKER_BUILD_DIR}/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh RUN chmod +x /usr/local/bin/docker-entrypoint.sh -RUN mkdir -p /data/odoo -VOLUME ["/data/odoo"] - +RUN mkdir -p /data/odoo /opt/odoo/etc ENV \ - ADDONS_PATH=/opt/odoo/lib/python3.8/site-packages/odoo/addons,/opt/odoo/addons \ + ADDONS_PATH=/opt/odoo/lib/python${PYTHON_RELEASE}/site-packages/odoo/addons,/opt/odoo/addons \ ADMIN_PASSWD=admin \ AUTO_RELOAD=False \ CSV_INTERNAL_SEP=, \ DATA_DIR=/data/odoo \ + DBFILTER=^.*$ \ DB_HOST=db \ DB_MAXCONN=64 \ DB_NAME=odoo14 \ @@ -63,7 +63,6 @@ ENV \ DB_SSLMODE=prefer \ DB_TEMPLATE=template1 \ DB_USER=odoo \ - DBFILTER=^.*$ \ DEBUG_MODE=False \ EMAIL_FROM=False \ HTTP_PORT=8069 \ @@ -71,33 +70,34 @@ ENV \ KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf \ LANG=C.UTF-8 \ LC_ALL=C.UTF-8 \ - LIMIT_MEMORY_HARD=2684354560 \ - LIMIT_MEMORY_SOFT=2147483648 \ + LIMIT_MEMORY_HARD=1395864371 \ + LIMIT_MEMORY_SOFT=255652815 \ LIMIT_REQUEST=8192 \ LIMIT_TIME_CPU=60 \ LIMIT_TIME_REAL=120 \ LIMIT_TIME_REAL_CRON=120 \ LIST_DB=False \ + LOGFILE=/dev/stdout \ + LOGROTATE=False \ LOG_DB=False \ LOG_HANDLER=:INFO \ LOG_LEVEL=info \ - LOGFILE=/dev/stdout \ - LOGROTATE=False \ LONGPOLLING_PORT=8072 \ - MAX_CRON_THREADS=2 \ + MAX_CRON_THREADS=1 \ ODOO_RC=/opt/odoo/etc/odoo.conf \ - OSV_MEMORY_AGE_LIMIT=1.0 \ + OSV_MEMORY_AGE_LIMIT=False \ OSV_MEMORY_COUNT_LIMIT=False \ PATH=/opt/odoo/bin:$PATH \ PROXY_MODE=True \ RUNNING_ENV=dev \ - SERVER_WIDE_MODULES=web \ + SERVER_WIDE_MODULES=base,web \ SMTP_PASSWORD=False \ SMTP_PORT=25 \ SMTP_SERVER=False \ SMTP_SSL=False \ SMTP_USER=False \ SYSLOG=False \ + TRANSIENT_AGE_LIMIT=1.0 \ UNACCENT=False \ WITHOUT_DEMO=True \ WORKERS=0 \ @@ -105,13 +105,19 @@ ENV \ XMLRPC_PORT=8069 \ XMLRPCS=True \ XMLRPCS_PORT=8071 +COPY odoo.conf.tpl /opt/odoo/etc/ -EXPOSE 8069 8071 8072 +VOLUME ["/data/odoo"] + +WORKDIR /opt/odoo + +EXPOSE 8069 8070 8071 8072 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] CMD ["odoo"] FROM dist as master +ARG PYTHON_RELEASE=3.8 ARG UID ARG USER ENV UID=${UID:-999} @@ -138,23 +144,23 @@ RUN let $UID >/dev/null 2>&1 \ && chown $UID:$GID /home/$USER \ || true -COPY librezo-addons/ /opt/odoo/librezo-addons/ -ENV ADDONS_PATH=${ADDONS_PATH},/opt/odoo/librezo-addons - +COPY extra-requirements.txt /opt/odoo/ RUN apk add --no-cache --virtual .build-deps \ g++ \ git \ libffi-dev \ make \ - && /opt/odoo/bin/pip3.8 install -r /opt/odoo/librezo-addons/requirements.txt \ + && /opt/odoo/bin/pip${PYTHON_RELEASE} install -r /opt/odoo/extra-requirements.txt \ && rm -rf /root/.cache \ && apk del --no-network .build-deps \ && find /opt/odoo/lib -type f -executable \ -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ | sort -u \ - | awk 'system("[ -e /lib/"$1" -o -e /usr/lib/"$1" -o -e /opt/odoo/lib/python3.8/site-packages/*/"$1" ]") == 0 { next } { print "so:" $1 }' \ + | awk 'system("[ -e /lib/"$1" -o -e /usr/lib/"$1" -o -e /opt/odoo/lib/python'"${PYTHON_RELEASE}"'/site-packages/*/"$1" ]") == 0 { next } { print "so:" $1 }' \ | xargs -rt apk add --no-cache -COPY entrypoint.d/ /opt/odoo/entrypoint.d/ -COPY migration.yml /opt/odoo/ +COPY --chown=${USER} *.yml /opt/odoo/ +COPY --chown=${USER} entrypoint.d/ /opt/odoo/entrypoint.d/ +COPY --chown=${USER} extra-addons/ /opt/odoo/extra-addons/ +ENV ADDONS_PATH=${ADDONS_PATH},/opt/odoo/extra-addons diff --git a/docker/odoo14/docker-entrypoint.sh b/docker/odoo14/docker-entrypoint.sh index 9fedf6f..c58c73c 100644 --- a/docker/odoo14/docker-entrypoint.sh +++ b/docker/odoo14/docker-entrypoint.sh @@ -1,8 +1,22 @@ #!/bin/sh set -e -mkdir -p /opt/odoo/etc -envsubst < /opt/odoo/odoo.conf.tpl > /opt/odoo/etc/odoo.conf +if [ -z "${NOGOSU:-}" ]; then + GOSU="gosu odoo" +else + GOSU="" +fi + +envsubst < /opt/odoo/etc/odoo.conf.tpl > /opt/odoo/etc/odoo.conf +chown odoo: /opt/odoo/etc/odoo.conf + +DATA_DIR="${DATA_DIR:-/data/odoo}" +for dir in "${DATA_DIR}/addons" "${DATA_DIR}/filestore" "${DATA_DIR}/sessions"; do + mkdir -p "${dir}" + if [ ! "$(stat -c '%U' "${dir}")" = "odoo" ]; then + chown -R odoo: "${dir}" + fi +done export PGHOST="${DB_HOST:-db}" export PGPORT="${DB_PORT:-5432}" @@ -10,46 +24,39 @@ export PGUSER="${DB_USER:-odoo}" export PGPASSWORD="${DB_PASSWORD:-odoo}" export PGDATABASE="${DB_NAME:-odoo}" -mkdir -p /data/odoo/{addons,filestore,sessions} -if [ ! "$(stat -c '%U' /data/odoo)" = "odoo" ]; then - chown -R odoo: /data/odoo -fi - -BASE_CMD=$(basename $1) -if [ "$BASE_CMD" = "odoo" ] || [ "$BASE_CMD" = "odoo.py" ] || [ "$BASE_CMD" = "odoo-bin" ] || [ "$BASE_CMD" = "openerp-server" ] ; then +CMD=$(basename "$1") +if [ "${CMD}" = "odoo" ] \ + || [ "${CMD}" = "odoo.py" ] \ + || [ "${CMD}" = "odoo-bin" ] \ + || [ "${CMD}" = "openerp-server" ]; then # wait db - while ! psql -l -h "$DB_HOST" -U "$DB_USER" >/dev/null 2>&1; do + while ! psql -l -h "${PGHOST}" -U "${PGUSER}" >/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 + [ "${count}" -eq "${DB_WAIT:-24}" ] \ + && echo "ERROR: unable to connect to PGHOST ${PGHOST} with PGUSER ${PGUSER}" \ + && exit 1 sleep 1 done # create db - 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" + if ! psql -lqtA -h "${PGHOST}" -U "${PGUSER}" | grep -q "^${PGDATABASE}|"; then + createdb -h "${PGHOST}" -U "${PGUSER}" -O "${PGUSER}" "${PGDATABASE}" fi # update db - MARABUNTA_DB_HOST="$DB_HOST" \ - MARABUNTA_DATABASE="$DB_NAME" \ - MARABUNTA_DB_USER="$DB_USER" \ - MARABUNTA_DB_PASSWORD="$DB_PASSWORD" \ - MARABUNTA_DB_PORT="$DB_PORT" \ - unbuffer marabunta --migration-file /opt/odoo/migration.yml + MARABUNTA_DB_HOST="${PGHOST}" \ + MARABUNTA_DATABASE="${PGDATABASE}" \ + MARABUNTA_DB_USER="${PGUSER}" \ + MARABUNTA_DB_PASSWORD="${PGPASSWORD}" \ + MARABUNTA_DB_PORT="${PGPORT}" \ + ${GOSU} unbuffer marabunta --migration-file /opt/odoo/migration.yml + # customs entrypoints ENTRYPOINT_DIR=/opt/odoo/entrypoint.d - if [ -d "$ENTRYPOINT_DIR" ]; then - if [ -z "${NOGOSU:-}" ] ; then - gosu odoo run-parts "$ENTRYPOINT_DIR" - else - run-parts "$ENTRYPOINT_DIR" - fi + if [ -d "${ENTRYPOINT_DIR}" ]; then + ${GOSU} run-parts "${ENTRYPOINT_DIR}" fi fi -if [ -z "${NOGOSU:-}" ] ; then - exec gosu odoo "$@" -else - exec "$@" -fi +exec ${GOSU} "$@" diff --git a/librezo-addons/base_librezo/__init__.py b/extra-addons/base_librezo/__init__.py similarity index 100% rename from librezo-addons/base_librezo/__init__.py rename to extra-addons/base_librezo/__init__.py diff --git a/librezo-addons/base_librezo/__manifest__.py b/extra-addons/base_librezo/__manifest__.py similarity index 69% rename from librezo-addons/base_librezo/__manifest__.py rename to extra-addons/base_librezo/__manifest__.py index 14f5b08..e834b6f 100644 --- a/librezo-addons/base_librezo/__manifest__.py +++ b/extra-addons/base_librezo/__manifest__.py @@ -1,21 +1,28 @@ { "name": "Librezo", + "version": "14.0.1.0.0", + "category": "hidden", "summary": "Librezo base settings", + "website": "http://www.librezo.com", "author": "aya", "license": "AGPL-3", - "website": "http://www.librezo.com", - "category": "hidden", - "version": "14.0.1.0.0", "depends": [ "base", "l10n_fr", "contacts", - "sale", + "sale_management", "server_environment_ir_config_parameter", "server_environment_data_encryption", - "pattern_import_export_xlsx", + "pattern_import_export", "pattern_import_export_csv", + "pattern_import_export_xlsx", + "product", + "website", + "web_company_color", + "web_environment_ribbon", ], "data": [], "demo": [], + "installable": True, + "auto_install": True, } diff --git a/extra-requirements.txt b/extra-requirements.txt new file mode 100644 index 0000000..14c2af2 --- /dev/null +++ b/extra-requirements.txt @@ -0,0 +1,25 @@ +--find-links https://wheelhouse.acsone.eu/manylinux1 +--extra-index https://wheelhouse.acsone.eu/shopinvader-simple +--extra-index-url https://wheelhouse.odoo-community.org/oca-simple +click-odoo==1.5.0 +click-odoo-contrib==1.15.1 +marabunta==0.10.6 +odoo14-addon-auth-api-key==14.0.2.1.0 +odoo14-addon-base-export-manager==14.0.1.0.1 +odoo14-addon-base-jsonify==14.0.1.5.0 +odoo14-addon-component==14.0.1.1.0 +odoo14-addon-data-encryption==14.0.1.0.1.dev3 +odoo14-addon-module-change-auto-install==14.0.1.0.3 +odoo14-addon-onchange-helper==14.0.1.0.1 +odoo14-addon-partner-address-version==14.0.1.0.1.dev2 +odoo14-addon-pattern-import-export==14.0.2.2.1 +odoo14-addon-pattern-import-export-csv==14.0.1.0.1 +odoo14-addon-pattern-import-export-xlsx==14.0.2.0.1 +odoo14-addon-queue-job==14.0.2.3.0 +odoo14-addon-server-environment==14.0.2.1.0 +odoo14-addon-server-environment-data-encryption==14.0.1.0.1 +odoo14-addon-server-environment-ir-config-parameter==14.0.1.1.0 +odoo14-addon-web-company-color==14.0.1.1.0 +odoo14-addon-web-environment-ribbon==14.0.1.0.1.dev5 +odoo14-addon-web-notify==14.0.1.0.1 +pyyaml==6.0 diff --git a/librezo-addons/requirements.txt b/librezo-addons/requirements.txt deleted file mode 100644 index 8ea4e3a..0000000 --- a/librezo-addons/requirements.txt +++ /dev/null @@ -1,22 +0,0 @@ ---find-links https://wheelhouse.acsone.eu/manylinux1 ---extra-index https://wheelhouse.acsone.eu/shopinvader-simple ---extra-index-url https://wheelhouse.odoo-community.org/oca-simple -click-odoo==1.4.3 -click-odoo-contrib==1.12.0 -marabunta==0.10.6 -odoo14-addon-auth-api-key==14.0.1.0.1.dev4 -odoo14-addon-base-exception==14.0.1.0.1.dev2 -odoo14-addon-base-export-manager @ git+https://github.com/OCA/server-ux@73502f8c86fcda8e28e8dabe2711347cececda9e#subdirectory=setup/base_export_manager -odoo14-addon-base-jsonify==14.0.1.1.0 -odoo14-addon-component==14.0.1.0.2 -odoo14-addon-data-encryption @ git+https://github.com/OCA/server-env@5815237d403bb7d7527fd6f8b6b6c4a08a4acbeb#subdirectory=setup/data_encryption -odoo14-addon-onchange-helper==14.0.1.0.1.dev2 -odoo14-addon-partner-address-version @ git+https://github.com/oca/partner-contact.git@dff3343f930a4b7451db305611e6a060f2aa37cc#subdirectory=setup/partner_address_version -odoo14-addon-pattern-import-export @ git+https://github.com/shopinvader/pattern-import-export.git@efc838258c8a750eb6542d4081dd4cbf939c41b1#subdirectory=setup/pattern_import_export -odoo14-addon-pattern-import-export-csv @ git+https://github.com/shopinvader/pattern-import-export.git@efc838258c8a750eb6542d4081dd4cbf939c41b1#subdirectory=setup/pattern_import_export_csv -odoo14-addon-pattern-import-export-xlsx @ git+https://github.com/shopinvader/pattern-import-export.git@efc838258c8a750eb6542d4081dd4cbf939c41b1#subdirectory=setup/pattern_import_export_xlsx -odoo14-addon-queue-job==14.0.1.0.2 -odoo14-addon-server-environment==14.0.1.0.1.dev5 -odoo14-addon-server-environment-data-encryption @ git+https://github.com/OCA/server-env@5815237d403bb7d7527fd6f8b6b6c4a08a4acbeb#subdirectory=setup/server_environment_data_encryption -odoo14-addon-server-environment-ir-config-parameter==14.0.1.0.1.dev2 -odoo14-addon-web-notify @ git+https://github.com/OCA/web@21b8349413916fb7be4b78d97b67a7bf65f9a18d#subdirectory=setup/web_notify diff --git a/migration.yml b/migration.yml index 0dc8241..3530dc4 100644 --- a/migration.yml +++ b/migration.yml @@ -6,7 +6,7 @@ migration: operations: pre: - 'sh -c ''psql -c "CREATE EXTENSION pg_trgm;"''' + - 'sh -c ''psql -c "CREATE EXTENSION unaccent;"''' addons: upgrade: - base_librezo - - web diff --git a/docker/odoo14/odoo.conf.tpl b/odoo.conf.tpl similarity index 89% rename from docker/odoo14/odoo.conf.tpl rename to odoo.conf.tpl index e191e47..5c30cbd 100644 --- a/docker/odoo14/odoo.conf.tpl +++ b/odoo.conf.tpl @@ -18,8 +18,8 @@ email_from = ${EMAIL_FROM} http_port = ${HTTP_PORT} http_enable = ${HTTP_ENABLE} http_interface = ${HTTP_INTERFACE} -limit_memory_soft = ${LIMIT_MEMORY_SOFT} limit_memory_hard = ${LIMIT_MEMORY_HARD} +limit_memory_soft = ${LIMIT_MEMORY_SOFT} limit_request = ${LIMIT_REQUEST} limit_time_cpu = ${LIMIT_TIME_CPU} limit_time_real = ${LIMIT_TIME_REAL} @@ -32,6 +32,8 @@ logfile = ${LOGFILE} logrotate = ${LOGROTATE} longpolling_port = ${LONGPOLLING_PORT} max_cron_threads = ${MAX_CRON_THREADS} +modules_auto_install_disabled = ${MODULES_AUTO_INSTALL_DISABLED} +modules_auto_install_enabled = ${MODULES_AUTO_INSTALL_ENABLED} osv_memory_age_limit = ${OSV_MEMORY_AGE_LIMIT} osv_memory_count_limit = ${OSV_MEMORY_COUNT_LIMIT} proxy_mode = ${PROXY_MODE} @@ -43,6 +45,7 @@ smtp_server = ${SMTP_SERVER} smtp_ssl = ${SMTP_SSL} smtp_user = ${SMTP_USER} syslog = ${SYSLOG} +transient_age_limit = ${TRANSIENT_AGE_LIMIT} unaccent = ${UNACCENT} without_demo = ${WITHOUT_DEMO} workers = ${WORKERS}