diff --git a/bitnami/odoo/12/debian-9/Dockerfile b/bitnami/odoo/12/debian-9/Dockerfile index 40ef93c2c584..bf729c4ef802 100644 --- a/bitnami/odoo/12/debian-9/Dockerfile +++ b/bitnami/odoo/12/debian-9/Dockerfile @@ -5,13 +5,9 @@ ENV PATH="/opt/bitnami/python/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/ COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl dirmngr ghostscript gnupg imagemagick libbsd0 libbz2-1.0 libc6 libedit2 libffi6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libhogweed4 libicu57 libidn11 libldap-2.4-2 liblzma5 libncurses5 libnettle6 libp11-kit0 libpq5 libreadline7 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo5 libuuid1 libxml2 libxslt1.1 procps unzip zlib1g -RUN curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-1.0.0-1-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz && \ - echo "80488279b056d5e9c183fe34097c5f496715ab16a602afcc9f78d59f15139a16 /tmp/nami-linux-x64.tar.gz" | sha256sum --check && \ - mkdir -p /opt/bitnami/nami /opt/bitnami/licenses && \ - tar xzf /tmp/nami-linux-x64.tar.gz --strip 1 -C /opt/bitnami/nami && \ - rm /tmp/nami-linux-x64.tar.gz && \ - curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-1.0.0-1.txt +RUN install_packages ca-certificates curl dirmngr ghostscript gnupg imagemagick libbsd0 libbz2-1.0 libc6 libedit2 libffi6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libhogweed4 libicu57 libidn11 libldap-2.4-2 liblzma5 libncurses5 libnettle6 libp11-kit0 libpq5 libreadline7 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo5 libuuid1 libxml2 libxslt1.1 procps sudo unzip zlib1g +RUN /bitnami-user.sh && \ + /install-nami.sh RUN bitnami-pkg install python-3.6.10-0 --checksum 3d7e860761a828ac03c631386b6711433e07bd96d6184d73c11f59d6a7e3b480 RUN bitnami-pkg install postgresql-client-11.6.0-0 --checksum 84762a54c89698bd4bf9bc380252591492b67464918c291cf2b666e1a74b8f3b RUN bitnami-pkg install node-7.10.1-1 --checksum 53362288e961d298a724353710a31901d4cb8237894a26a2f676b35450c02975 @@ -34,7 +30,7 @@ RUN for server in "ha.pool.sks-keyservers.net" "hkp://p80.pool.sks-keyservers.ne COPY rootfs / ENV BITNAMI_APP_NAME="odoo" \ - BITNAMI_IMAGE_VERSION="12.0.20191215-debian-9-r25" \ + BITNAMI_IMAGE_VERSION="12.0.20191215-debian-9-r26" \ ODOO_EMAIL="user@example.com" \ ODOO_PASSWORD="bitnami" \ POSTGRESQL_HOST="postgresql" \ diff --git a/bitnami/odoo/12/debian-9/prebuildfs/bitnami-user.sh b/bitnami/odoo/12/debian-9/prebuildfs/bitnami-user.sh new file mode 100755 index 000000000000..ab84296bcdfa --- /dev/null +++ b/bitnami/odoo/12/debian-9/prebuildfs/bitnami-user.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +useradd -ms /bin/bash bitnami +mkdir -p /opt/bitnami && chown bitnami:bitnami /opt/bitnami +sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers +echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers diff --git a/bitnami/odoo/12/debian-9/prebuildfs/install-nami.sh b/bitnami/odoo/12/debian-9/prebuildfs/install-nami.sh new file mode 100755 index 000000000000..d8a59c381f6d --- /dev/null +++ b/bitnami/odoo/12/debian-9/prebuildfs/install-nami.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-1.0.0-1-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz +echo "80488279b056d5e9c183fe34097c5f496715ab16a602afcc9f78d59f15139a16 /tmp/nami-linux-x64.tar.gz" | sha256sum --check +mkdir -p /opt/bitnami/nami /opt/bitnami/licenses +tar xzf /tmp/nami-linux-x64.tar.gz --strip 1 -C /opt/bitnami/nami && rm /tmp/nami-linux-x64.tar.gz +curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-1.0.0-1.txt diff --git a/bitnami/odoo/README.md b/bitnami/odoo/README.md index bfc3542d9622..7519b378f5a7 100644 --- a/bitnami/odoo/README.md +++ b/bitnami/odoo/README.md @@ -41,7 +41,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`13-ol-7`, `13.0.20200110-ol-7-r4` (13/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/13.0.20200110-ol-7-r4/13/ol-7/Dockerfile) * [`13-debian-9`, `13.0.20200110-debian-9-r3`, `13`, `13.0.20200110`, `13.0.20200110-r3`, `latest` (13/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/13.0.20200110-debian-9-r3/13/debian-9/Dockerfile) * [`12-ol-7`, `12.0.20191215-ol-7-r35` (12/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/12.0.20191215-ol-7-r35/12/ol-7/Dockerfile) -* [`12-debian-9`, `12.0.20191215-debian-9-r25`, `12`, `12.0.20191215`, `12.0.20191215-r25` (12/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/12.0.20191215-debian-9-r25/12/debian-9/Dockerfile) +* [`12-debian-9`, `12.0.20191215-debian-9-r26`, `12`, `12.0.20191215`, `12.0.20191215-r26` (12/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/12.0.20191215-debian-9-r26/12/debian-9/Dockerfile) * [`11-ol-7`, `11.0.20191215-ol-7-r35` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/11.0.20191215-ol-7-r35/11/ol-7/Dockerfile) * [`11-debian-9`, `11.0.20191215-debian-9-r23`, `11`, `11.0.20191215`, `11.0.20191215-r23` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/11.0.20191215-debian-9-r23/11/debian-9/Dockerfile)