From 9323219289a159fbc3b0bf0281962c3655189444 Mon Sep 17 00:00:00 2001 From: Andris Date: Sun, 2 Feb 2020 17:20:40 +0100 Subject: [PATCH] [FIX] Odoo 11.0-13.0: install odoo deb in one pass Before this commit, the deb package was installed in two steps. The first step was to use dpkg and force the install, the second step was to repair the broken install. --- 11.0/Dockerfile | 3 +-- 12.0/Dockerfile | 3 +-- 13.0/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 1d313ca..482b08a 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -56,9 +56,8 @@ ARG ODOO_SHA=e21c34a263785eea09babd7a0d876ba05c841935 RUN set -x; \ 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 \ - && apt-get -y install -f --no-install-recommends \ + && apt-get -y install --no-install-recommends ./odoo.deb\ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 790f436..a8b680d 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -70,9 +70,8 @@ ARG ODOO_SHA=ca4a7485b0b75850ffe1458a8f3266839400a501 RUN set -x; \ 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 \ - && apt-get -y install -f --no-install-recommends \ + && apt-get -y install --no-install-recommends ./odoo.deb \ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 4df42f5..11789fb 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -58,9 +58,8 @@ ARG ODOO_SHA=db29fbcebf63f9f656e9445f462190ac775ee533 RUN set -x; \ 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 \ - && apt-get -y install -f --no-install-recommends \ + && apt-get -y install --no-install-recommends ./odoo.deb \ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file