From 7ada0596501407b2361d53453445a69e397285b0 Mon Sep 17 00:00:00 2001 From: Andris Date: Sun, 2 Feb 2020 16:03:29 +0100 Subject: [PATCH] removed set -x and set BASH explicitely. Dash can be unpredictable. With podman use: --format=docker --- 11.0/Dockerfile | 11 +++++------ 12.0/Dockerfile | 14 ++++++-------- 13.0/Dockerfile | 14 ++++++-------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 096cfff..6901490 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -1,6 +1,8 @@ FROM debian:stretch-slim LABEL maintainer Odoo S.A. +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 @@ -8,8 +10,7 @@ ENV LANG C.UTF-8 RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN set -x; \ - apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ @@ -37,8 +38,7 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client -RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ @@ -53,8 +53,7 @@ RUN set -x; \ ENV ODOO_VERSION 11.0 ARG ODOO_RELEASE=20200121 ARG ODOO_SHA=13f30434cb4fb28b11d78fd4e7c616d03362f779 -RUN set -x; \ - curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 883c241..823d0e3 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -1,6 +1,8 @@ FROM debian:stretch-slim LABEL maintainer Odoo S.A. +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 @@ -8,8 +10,7 @@ ENV LANG C.UTF-8 RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN set -x; \ - apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ @@ -37,8 +38,7 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client -RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ @@ -50,8 +50,7 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* # Install rtlcss (on Debian stretch) -RUN set -x;\ - echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \ +RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ @@ -67,8 +66,7 @@ RUN set -x;\ ENV ODOO_VERSION 12.0 ARG ODOO_RELEASE=20200121 ARG ODOO_SHA=cb0bcb5d239983468c2e3b3f7cf17f58df820b1c -RUN set -x; \ - curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index b4b4d08..2a16177 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -1,12 +1,13 @@ FROM debian:buster-slim LABEL maintainer Odoo S.A. +SHELL ["/bin/bash", "-xo", "pipefail", "-c"] + # Generate locale C.UTF-8 for postgres and general locale data ENV LANG C.UTF-8 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf -RUN set -x; \ - apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ @@ -35,8 +36,7 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client -RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ @@ -48,15 +48,13 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* # Install rtlcss (on Debian buster) -RUN set -x; \ - npm install -g rtlcss +RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 13.0 ARG ODOO_RELEASE=20200121 ARG ODOO_SHA=770d71cfafb9a8f8419b88f8033b964d5742ad57 -RUN set -x; \ - curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ +RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && dpkg --force-depends -i odoo.deb \ && apt-get update \