From eded56a4ef0d6fb80793571c290e45ec07cfb606 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 4 Jun 2024 08:40:19 +0200 Subject: [PATCH] [FIX] runbot: adapt docker template for debian control The Debian control file was changed in odoo/odoo@55849aca in order to work with Ubuntu Noble. Because of that, it was needed to have a more robust parsing of the Debian Control file format. --- runbot/templates/dockerfile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runbot/templates/dockerfile.xml b/runbot/templates/dockerfile.xml index cc636b50..8de28b6c 100644 --- a/runbot/templates/dockerfile.xml +++ b/runbot/templates/dockerfile.xml @@ -87,7 +87,7 @@ RUN curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - ADD https://raw.githubusercontent.com/odoo/odoo//debian/control /tmp/control.txt RUN apt-get update \ && sed -n '/^Depends:/,/^[A-Z]/p' /tmp/control.txt \ - | awk '/^ [a-z]/ { gsub(/,/,"") ; print $1 }' | sort -u \ + | awk '/^ [a-z]/ { gsub(/,/,"") ; gsub(" ", "") ; print $NF }' | sort -u \ | egrep -v 'postgresql-client' \ | sed 's/python-imaging/python-pil/'| sed 's/python-pypdf/python-pypdf2/' \ | DEBIAN_FRONTEND=noninteractive xargs apt-get install -y -qq \