From a1176473d40bf974adb53b231aa40813aceba10e Mon Sep 17 00:00:00 2001 From: vrenaville Date: Mon, 13 Jan 2025 09:42:25 +0100 Subject: [PATCH] fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fix: new flovar --- 15.0/Dockerfile | 3 +-- 16.0/Dockerfile | 3 +-- 17.0/Dockerfile | 3 +-- 18.0/Dockerfile | 3 +-- install/package_odoo_common.sh | 3 ++- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 39d3a9b4..1cc6773d 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -24,8 +24,7 @@ ENV BUILD_PACKAGE \ libssl-dev \ libjpeg-dev \ libpng-dev \ - zlib1g-dev \ - curl + zlib1g-dev # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 87d38273..06557cd6 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -24,8 +24,7 @@ ENV BUILD_PACKAGE \ libssl-dev \ libjpeg-dev \ libpng-dev \ - zlib1g-dev \ - curl + zlib1g-dev # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf # wkhtml-buster is kept as in official image, no deb available for bullseye diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 04a21896..b068da13 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -25,8 +25,7 @@ ENV BUILD_PACKAGE \ libssl-dev \ libjpeg-dev \ libpng-dev \ - zlib1g-dev \ - curl + zlib1g-dev # run in a virtualenv # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf diff --git a/18.0/Dockerfile b/18.0/Dockerfile index 5eae45b7..e4b3d035 100644 --- a/18.0/Dockerfile +++ b/18.0/Dockerfile @@ -24,8 +24,7 @@ ENV BUILD_PACKAGE \ libssl-dev \ libjpeg-dev \ libpng-dev \ - zlib1g-dev \ - curl + zlib1g-dev # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf # wkhtml-buster is kept as in official image, no deb available for bullseye diff --git a/install/package_odoo_common.sh b/install/package_odoo_common.sh index 5f7e3ae8..bfbe7c78 100755 --- a/install/package_odoo_common.sh +++ b/install/package_odoo_common.sh @@ -45,4 +45,5 @@ apt-get install -y --no-install-recommends \ python3-xlsxwriter \ python3-xlrd \ python3-zeep \ - git + git \ + curl