From 4b37e6fb8217ba1e9435873c63d886084f6146e2 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sun, 19 Mar 2023 14:30:18 +0100 Subject: [PATCH] [bitnami/odoo] Release 16.0.20221115-debian-11-r39 (#27791) Signed-off-by: Bitnami Containers --- bitnami/odoo/16/debian-11/Dockerfile | 14 +++---- .../opt/bitnami/.bitnami_components.json | 20 ++++----- .../opt/bitnami/scripts/libservice.sh | 41 +++++++++++++++++-- bitnami/odoo/README.md | 1 - 4 files changed, 54 insertions(+), 22 deletions(-) diff --git a/bitnami/odoo/16/debian-11/Dockerfile b/bitnami/odoo/16/debian-11/Dockerfile index 102632e723e9..e63fc77545a5 100644 --- a/bitnami/odoo/16/debian-11/Dockerfile +++ b/bitnami/odoo/16/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-14T09:31:08Z" \ + org.opencontainers.image.created="2023-03-19T12:24:03Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="16.0.20221115-debian-11-r38" \ + org.opencontainers.image.ref.name="16.0.20221115-debian-11-r39" \ org.opencontainers.image.title="odoo" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="16.0.20221115" @@ -22,12 +22,12 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl fontconfig libbrotli1 libbsd0 libbz2-1.0 libc6 libcap2-bin libcom-err2 libcrypt1 libedit2 libffi7 libfreetype6 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpng16-16 libpq5 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libx11-6 libxcb1 libxext6 libxml2 libxrender1 libxslt1.1 procps xfonts-75dpi xfonts-base zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "python-3.10.10-4-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-15.2.0-1-linux-${OS_ARCH}-debian-11" \ - "node-18.15.0-0-linux-${OS_ARCH}-debian-11" \ + "python-3.10.10-5-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-2-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-15.2.0-2-linux-${OS_ARCH}-debian-11" \ + "node-18.15.0-1-linux-${OS_ARCH}-debian-11" \ "odoo-16.0.20221115-1-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d1d60f65de86..be65bc5137c5 100644 --- a/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,17 +1,17 @@ { "gosu": { "arch": "amd64", - "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa", + "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-2" + "version": "1.16.0-3" }, "node": { "arch": "amd64", - "digest": "cc1030a32cab4b0f02fd57b2e2e98917779a496ef9ea0eba14e0f4c44b5bebfa", + "digest": "6a3b2d1e7ab2f53f2f70faa3bab6406727c5024f73581294724b97eeb4ee4a2b", "distro": "debian-11", "type": "NAMI", - "version": "18.15.0-0" + "version": "18.15.0-1" }, "odoo": { "arch": "amd64", @@ -22,23 +22,23 @@ }, "postgresql-client": { "arch": "amd64", - "digest": "29659c3d87558bf03d65ffd4dfd4fee76cc89e05ec0ac595e26dc72b8e15dc14", + "digest": "f30b5782e06f5a81190143d77d76c364a73836ffa635b349478dcc1bee6b06ed", "distro": "debian-11", "type": "NAMI", - "version": "15.2.0-1" + "version": "15.2.0-2" }, "python": { "arch": "amd64", - "digest": "8989d5d5d7b39f95475e24f8bd537d0ec0eb22b9a266c9d0195003dc2126f238", + "digest": "333f80bba973342bbeae2bd476b08145ca03c39815436cbea4a3435251fd7652", "distro": "debian-11", "type": "NAMI", - "version": "3.10.10-4" + "version": "3.10.10-5" }, "render-template": { "arch": "amd64", - "digest": "185e277977366ec222d2bde1a395ffa138ce1a9d3bdf1df20c3e49e8b8f9c68b", + "digest": "d1a128e25098f793a92342efd5fa85c1075a2b21042929b269d23c6694e20c3b", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-1" + "version": "1.0.5-2" } } \ No newline at end of file diff --git a/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d53aca9af84..2d4b7af6fd3a 100644 --- a/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -281,6 +281,8 @@ remove_logrotate_conf() { # --environment - Environment variable to define (multiple --environment options may be passed) # --environment-file - Text file with environment variables # --exec-start - Start command (required) +# --exec-start-pre - Pre-start command (optional) +# --exec-start-post - Post-start command (optional) # --exec-stop - Stop command (optional) # --exec-reload - Reload command (optional) # --group - System group to start the service with @@ -292,6 +294,7 @@ remove_logrotate_conf() { # --success-exit-status - Exit code that indicates a successful shutdown # --type - Systemd unit type (defaults to forking) # --user - System user to start the service with +# --working-directory - Working directory at which to start the service # Returns: # None ######################### @@ -307,6 +310,8 @@ generate_systemd_conf() { local environment="" local environment_file="" local exec_start="" + local exec_start_pre="" + local exec_start_post="" local exec_stop="" local exec_reload="" local restart="always" @@ -316,6 +321,7 @@ generate_systemd_conf() { local limits_content="" local success_exit_status="" local custom_service_content="" + local working_directory="" # Parse CLI flags shift while [[ "$#" -gt 0 ]]; do @@ -334,6 +340,7 @@ generate_systemd_conf() { | --standard-error \ | --success-exit-status \ | --custom-service-content \ + | --working-directory \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift @@ -345,11 +352,21 @@ generate_systemd_conf() { shift limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}" ;; + --exec-start-pre) + shift + [[ -n "$exec_start_pre" ]] && exec_start_pre+=$'\n' + exec_start_pre+="ExecStartPre=${1:?"--exec-start-pre value is missing"}" + ;; + --exec-start-post) + shift + [[ -n "$exec_start_post" ]] && exec_start_post+=$'\n' + exec_start_post+="ExecStartPost=${1:?"--exec-start-post value is missing"}" + ;; --environment) shift # It is possible to add multiple environment lines [[ -n "$environment" ]] && environment+=$'\n' - environment+="Environment=${1:?"environment" is missing}" + environment+="Environment=${1:?"--environment value is missing"}" ;; *) echo "Invalid command line flag ${1}" >&2 @@ -376,8 +393,21 @@ PartOf=bitnami.service [Service] Type=${type} -ExecStart=${exec_start} EOF + if [[ -n "$working_directory" ]]; then + cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + fi + if [[ -n "$exec_start_pre" ]]; then + # This variable may contain multiple ExecStartPre= directives + cat >> "$service_file" <<< "$exec_start_pre" + fi + if [[ -n "$exec_start" ]]; then + cat >> "$service_file" <<< "ExecStart=${exec_start}" + fi + if [[ -n "$exec_start_post" ]]; then + # This variable may contain multiple ExecStartPost= directives + cat >> "$service_file" <<< "$exec_start_post" + fi # Optional stop and reload commands if [[ -n "$exec_stop" ]]; then cat >> "$service_file" <<< "ExecStop=${exec_stop}" @@ -399,8 +429,9 @@ EOF if [[ -n "$restart" ]]; then cat >> "$service_file" <<< "Restart=${restart}" fi - # Environment flags (may be specified multiple times in a unit) + # Environment flags if [[ -n "$environment" ]]; then + # This variable may contain multiple Environment= directives cat >> "$service_file" <<< "$environment" fi if [[ -n "$environment_file" ]]; then @@ -414,6 +445,7 @@ EOF cat >> "$service_file" <<< "StandardError=${standard_error}" fi if [[ -n "$custom_service_content" ]]; then + # This variable may contain multiple miscellaneous directives cat >> "$service_file" <<< "$custom_service_content" fi if [[ -n "$success_exit_status" ]]; then @@ -424,7 +456,8 @@ EOF fi cat >> "$service_file" < Odoo is an open source ERP and CRM platform, formerly known as OpenERP, that can connect a wide variety of business operations such as sales, supply chain, finance, and project management. [Overview of Odoo](https://www.odoo.com/) - Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. ## TL;DR