diff --git a/bitnami/odoo/13/debian-10/Dockerfile b/bitnami/odoo/13/debian-10/Dockerfile index f549de8f3f1f..78628ba44db3 100644 --- a/bitnami/odoo/13/debian-10/Dockerfile +++ b/bitnami/odoo/13/debian-10/Dockerfile @@ -5,7 +5,7 @@ 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 ca-certificates curl dirmngr fontconfig ghostscript gnupg imagemagick libbsd0 libbz2-1.0 libc6 libc6 libedit2 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libhogweed4 libicu63 libidn2-0 libjpeg62-turbo libldap-2.4-2 liblzma5 libncursesw6 libnettle6 libp11-kit0 libpng16-16 libpq5 libreadline7 libsasl2-2 libsqlite3-0 libssl1.1 libssl1.1 libstdc++6 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libx11-6 libxcb1 libxext6 libxml2 libxrender1 libxslt1.1 procps sudo unzip xfonts-75dpi xfonts-base zlib1g +RUN install_packages ca-certificates curl dirmngr fontconfig ghostscript gnupg gzip imagemagick libbsd0 libbz2-1.0 libc6 libcap2-bin libedit2 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libhogweed4 libicu63 libidn2-0 libjpeg62-turbo libldap-2.4-2 liblzma5 libncursesw6 libnettle6 libp11-kit0 libpng16-16 libpq5 libreadline7 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libx11-6 libxcb1 libxext6 libxml2 libxrender1 libxslt1.1 procps sudo tar xfonts-75dpi xfonts-base zlib1g RUN /build/bitnami-user.sh RUN /build/install-nami.sh RUN bitnami-pkg install python-3.6.10-10 --checksum e8a8da2e9d17d2198a16c390161e338a585ec182c083a4cbab205ae872e221de @@ -23,10 +23,13 @@ RUN curl -sLO https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12. COPY rootfs / ENV BITNAMI_APP_NAME="odoo" \ - BITNAMI_IMAGE_VERSION="13.0.20200510-debian-10-r14" \ + BITNAMI_IMAGE_VERSION="13.0.20200510-debian-10-r15" \ LD_LIBRARY_PATH="/opt/bitnami/odoo/venv/lib/python3.6/site-packages/reportlab/.libs:$LD_LIBRARY_PATH" \ ODOO_EMAIL="user@example.com" \ ODOO_PASSWORD="bitnami" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ POSTGRESQL_HOST="postgresql" \ POSTGRESQL_PASSWORD="" \ POSTGRESQL_PORT_NUMBER="5432" \ @@ -37,7 +40,7 @@ ENV BITNAMI_APP_NAME="odoo" \ SMTP_PROTOCOL="" \ SMTP_USER="" -EXPOSE 8069 8071 +EXPOSE 8069 8071 3000 ENTRYPOINT [ "/app-entrypoint.sh" ] CMD [ "nami", "start", "--foreground", "odoo" ] diff --git a/bitnami/odoo/13/debian-10/docker-compose.yml b/bitnami/odoo/13/debian-10/docker-compose.yml index cbc5311936a2..be376086fa4f 100644 --- a/bitnami/odoo/13/debian-10/docker-compose.yml +++ b/bitnami/odoo/13/debian-10/docker-compose.yml @@ -1,13 +1,13 @@ version: '2' services: postgresql: - image: 'bitnami/postgresql:11' + image: 'docker.io/bitnami/postgresql:11-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes volumes: - 'postgresql_data:/bitnami/postgresql' odoo: - image: 'bitnami/odoo:13' + image: 'docker.io/bitnami/odoo:13-debian-10' ports: - '80:8069' - '443:8071' diff --git a/bitnami/odoo/13/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/odoo/13/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/odoo/13/debian-10/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,24 @@ +#!/bin/sh +set -e +set -u +export DEBIAN_FRONTEND=noninteractive +n=0 +max=2 +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +rm -r /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/odoo/README.md b/bitnami/odoo/README.md index 86b5f9525b0d..a2268d26adf4 100644 --- a/bitnami/odoo/README.md +++ b/bitnami/odoo/README.md @@ -36,7 +36,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`13-debian-10`, `13.0.20200510-debian-10-r14`, `13`, `13.0.20200510`, `latest` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/13.0.20200510-debian-10-r14/13/debian-10/Dockerfile) +* [`13-debian-10`, `13.0.20200510-debian-10-r15`, `13`, `13.0.20200510`, `latest` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/13.0.20200510-debian-10-r15/13/debian-10/Dockerfile) * [`12-debian-10`, `12.0.20200515-debian-10-r10`, `12`, `12.0.20200515` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/12.0.20200515-debian-10-r10/12/debian-10/Dockerfile) * [`11-debian-10`, `11.0.20200515-debian-10-r10`, `11`, `11.0.20200515` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/11.0.20200515-debian-10-r10/11/debian-10/Dockerfile) diff --git a/bitnami/odoo/docker-compose.yml b/bitnami/odoo/docker-compose.yml index cbc5311936a2..be376086fa4f 100644 --- a/bitnami/odoo/docker-compose.yml +++ b/bitnami/odoo/docker-compose.yml @@ -1,13 +1,13 @@ version: '2' services: postgresql: - image: 'bitnami/postgresql:11' + image: 'docker.io/bitnami/postgresql:11-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes volumes: - 'postgresql_data:/bitnami/postgresql' odoo: - image: 'bitnami/odoo:13' + image: 'docker.io/bitnami/odoo:13-debian-10' ports: - '80:8069' - '443:8071'