From 15b6cf888c021ca8dc2b148516d37b88c53ea598 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 29 Sep 2023 13:26:56 +0200 Subject: [PATCH] [IMP] packaging: adapt packaging for current distros As Odoo, now, needs at least python 3.10 have to build it against the current distros. closes odoo/odoo#136904 Related: odoo/documentation#5940 Signed-off-by: Thibault Delavallee (tde) --- setup/package.dfdebian | 2 +- setup/package.dffedora | 2 +- setup/package.py | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/setup/package.dfdebian b/setup/package.dfdebian index f4977055b6b..b196dcb0166 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -1,6 +1,6 @@ # Please note that this Dockerfile is used for testing nightly builds and should # not be used to deploy Odoo -FROM debian:bullseye +FROM debian:bookworm MAINTAINER Odoo S.A. RUN apt-get update && \ diff --git a/setup/package.dffedora b/setup/package.dffedora index ecd55c376e4..9d8e303f1c0 100644 --- a/setup/package.dffedora +++ b/setup/package.dffedora @@ -1,6 +1,6 @@ # Please note that this Dockerfile is used for testing nightly builds and should # not be used to deploy Odoo -FROM fedora:36 +FROM fedora:38 MAINTAINER Odoo S.A. # Dependencies and postgres diff --git a/setup/package.py b/setup/package.py index bae473da887..97a52d7419e 100755 --- a/setup/package.py +++ b/setup/package.py @@ -327,11 +327,9 @@ class DockerDeb(Docker): logging.info('Start testing debian package') cmds = [ 'service postgresql start', - 'su postgres -s /bin/bash -c "createdb mycompany"', '/usr/bin/apt-get update -y', - '/usr/bin/dpkg -i /data/src/odoo_%s.%s_all.deb ; /usr/bin/apt-get install -f -y' % (VERSION, TSTAMP), - 'su odoo -s /bin/bash -c "odoo -d mycompany -i base --stop-after-init"', - 'su odoo -s /bin/bash -c "odoo -d mycompany --pidfile=/data/src/odoo.pid"', + f'/usr/bin/apt-get install -y /data/src/odoo_{VERSION}.{TSTAMP}_all.deb', + 'su odoo -s /bin/bash -c "odoo -d mycompany -i base --pidfile=/data/src/odoo.pid"', ] self.run(' && '.join(cmds), self.args.build_dir, 'odoo-deb-test-%s' % TSTAMP, user='root', detach=True, exposed_port=8069, timeout=300) self.test_odoo()