From 9b13c3610d537db3d722438ed6566c925ed65f8d Mon Sep 17 00:00:00 2001 From: Olivier Fahrni Date: Thu, 9 Feb 2023 16:22:53 +0100 Subject: [PATCH] [IMP] Use latest nightly build by default --- 14.0/Dockerfile | 10 ++++++---- 15.0/Dockerfile | 10 ++++++---- 16.0/Dockerfile | 10 ++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 6dd7a8566..556f6e2cf 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -55,10 +55,12 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 14.0 -ARG ODOO_RELEASE=20230109 -ARG ODOO_SHA=ef9eef9a5e5bbeb455ac7d1c05cc675e74876609 -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 - \ +ARG ODOO_RELEASE=latest +ARG ODOO_SHA +RUN latest_sha1=$(curl -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/Packages | grep -e "^SHA1:" | sed "s/SHA1: //") \ + && sha_value=${ODOO_SHA-${latest_sha1}} \ + && curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo "${sha_value} odoo.deb" | sha1sum -c - \ && apt-get update \ && apt-get -y install --no-install-recommends ./odoo.deb \ && rm -rf /var/lib/apt/lists/* odoo.deb diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 575181244..dd31a54f0 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -55,10 +55,12 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 15.0 -ARG ODOO_RELEASE=20230109 -ARG ODOO_SHA=618e45490616f63dfb68077523c2971cbb6cdda7 -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 - \ +ARG ODOO_RELEASE=latest +ARG ODOO_SHA +RUN latest_sha1=$(curl -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/Packages | grep -e "^SHA1:" | sed "s/SHA1: //") \ + && sha_value=${ODOO_SHA-${latest_sha1}} \ + && curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo "${sha_value} odoo.deb" | sha1sum -c - \ && apt-get update \ && apt-get -y install --no-install-recommends ./odoo.deb \ && rm -rf /var/lib/apt/lists/* odoo.deb diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 04209e482..343f9c823 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -55,10 +55,12 @@ RUN npm install -g rtlcss # Install Odoo ENV ODOO_VERSION 16.0 -ARG ODOO_RELEASE=20230109 -ARG ODOO_SHA=884bf72c7318835b9ac56be2594032cbba7b8c7b -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 - \ +ARG ODOO_RELEASE=latest +ARG ODOO_SHA +RUN latest_sha1=$(curl -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/Packages | grep -e "^SHA1:" | sed "s/SHA1: //") \ + && sha_value=${ODOO_SHA-${latest_sha1}} \ + && curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ + && echo "${sha_value} odoo.deb" | sha1sum -c - \ && apt-get update \ && apt-get -y install --no-install-recommends ./odoo.deb \ && rm -rf /var/lib/apt/lists/* odoo.deb