diff --git a/bitnami/odoo/15/debian-12/Dockerfile b/bitnami/odoo/15/debian-12/Dockerfile index fb95ea2b83a8..20a64f8b7f68 100644 --- a/bitnami/odoo/15/debian-12/Dockerfile +++ b/bitnami/odoo/15/debian-12/Dockerfile @@ -7,11 +7,11 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-07-25T06:01:11Z" \ + org.opencontainers.image.created="2024-07-30T12:34:41Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/odoo/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="15.0.20240710-debian-12-r2" \ + org.opencontainers.image.ref.name="15.0.20240710-debian-12-r3" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/odoo" \ org.opencontainers.image.title="odoo" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -31,7 +31,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ "render-template-1.0.7-2-linux-${OS_ARCH}-debian-12" \ "postgresql-client-16.3.0-4-linux-${OS_ARCH}-debian-12" \ "node-18.20.4-4-linux-${OS_ARCH}-debian-12" \ - "odoo-15.0.20240710-0-linux-${OS_ARCH}-debian-12" \ + "odoo-15.0.20240710-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/odoo/15/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/odoo/15/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 96e10fdb1f5f..7b855de642b3 100644 --- a/bitnami/odoo/15/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/odoo/15/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,7 +9,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "15.0.20240710-0" + "version": "15.0.20240710-1" }, "postgresql-client": { "arch": "amd64", diff --git a/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/libodoo.sh b/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/libodoo.sh index 27602e41476e..a1756adfc656 100644 --- a/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/libodoo.sh +++ b/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/libodoo.sh @@ -137,7 +137,14 @@ odoo_initialize() { info "Generating configuration file" local template_dir="${BITNAMI_ROOT_DIR}/scripts/odoo/bitnami-templates" + # Configure polling port parameter depending on Odoo version + local event_port_parameter="longpolling_port" + if [ "$(odoo_major_version)" -gt 15 ]; then + event_port_parameter="gevent_port" + fi list_db="$(is_boolean_yes "$ODOO_LIST_DB" && echo 'True' || echo 'False')" \ + odoo_debug="$(is_boolean_yes "$BITNAMI_DEBUG" && echo 'True' || echo 'False')" \ + event_port_parameter="$event_port_parameter" \ render-template "${template_dir}/odoo.conf.tpl" > "$ODOO_CONF_FILE" if ! is_empty_value "$ODOO_SMTP_HOST"; then @@ -339,3 +346,16 @@ odoo_stop() { ! is_odoo_running && return stop_service_using_pid "$ODOO_PID_FILE" } + +######################## +# Get Odoo major version +# Globals: +# ODOO_BASE_DIR +# Arguments: +# None +# Returns: +# odoo major version +######################### +odoo_major_version() { + "${ODOO_BASE_DIR}/bin/odoo" --version 2>/dev/null | grep -E -o "[0-9]+.[0-9]+.[0-9]+" | cut -d'.' -f 1 +} diff --git a/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl b/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl index 4c14b33584c2..c98e300d315d 100644 --- a/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl +++ b/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl @@ -13,7 +13,7 @@ db_port = {{ODOO_DATABASE_PORT_NUMBER}} db_template = template1 db_user = {{ODOO_DATABASE_USER}} dbfilter = {{ODOO_DATABASE_FILTER}} -debug_mode = False +debug_mode = {{odoo_debug}} email_from = {{ODOO_EMAIL}} http_port = {{ODOO_PORT_NUMBER}} ; limit_memory_hard = 2684354560 @@ -27,7 +27,7 @@ list_db = {{list_db}} ; log_handler = [':INFO'] ; log_level = info ; logfile = {{ODOO_LOG_FILE}} -longpolling_port = {{ODOO_LONGPOLLING_PORT_NUMBER}} +{{event_port_parameter}} = {{ODOO_LONGPOLLING_PORT_NUMBER}} ; https://www.odoo.com/es_ES/forum/ayuda-1/could-not-obtain-lock-on-row-in-relation-ir-cron-74519 max_cron_threads = 1 pidfile = {{ODOO_PID_FILE}} @@ -42,4 +42,4 @@ proxy_mode = True ; smtp_ssl = False ; smtp_user = False ; without_demo = False -; workers = 0 +; workers = 2 diff --git a/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/odoo/postunpack.sh b/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/odoo/postunpack.sh index 604c9fcaf207..e971a09d284e 100755 --- a/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/odoo/postunpack.sh +++ b/bitnami/odoo/15/debian-12/rootfs/opt/bitnami/scripts/odoo/postunpack.sh @@ -20,7 +20,7 @@ set -o pipefail # The 'odoo-bin' tool is really the same as 'odoo', but due to the way it was installed, it appears in the latter form # Official Odoo docs refer to 'odoo-bin' so we add a symlink for users to be able to use any form -ln -s "${ODOO_BIN_DIR}/odoo" "${ODOO_BIN_DIR}/odoo-bin" +ln -sf "${ODOO_BIN_DIR}/odoo" "${ODOO_BIN_DIR}/odoo-bin" # Ensure the Odoo base directory exists and has proper permissions info "Configuring file permissions for Odoo"