From 3ca3e2375c7c93b41bd0f88d42e933256c4f5ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20-=20Le=20Filament?= <theo@le-filament.com>
Date: Wed, 9 Oct 2024 18:23:26 +0200
Subject: [PATCH] fix(Dockerfile): add missing filename to save commits of
default modules
---
15.0.Dockerfile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/15.0.Dockerfile b/15.0.Dockerfile
index 674654f..1598b4b 100644
--- a/15.0.Dockerfile
+++ b/15.0.Dockerfile
@@ -25,14 +25,14 @@ RUN set -x; \
&& curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.bullseye_amd64.deb \
&& echo 'cecbf5a6abbd68d324a7cd6c51ec843d71e98951 wkhtmltox.deb' | sha1sum -c - \
&& apt-get update \
- && apt-get install -y --no-install-recommends ./wkhtmltox.deb \
- && apt-get install -y --no-install-recommends postgresql-client \
- && apt-get -y autoremove \
+ && apt-get install --yes --no-install-recommends ./wkhtmltox.deb \
+ && apt-get install --yes --no-install-recommends postgresql-client \
+ && apt-get --yes autoremove \
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb
COPY --from=builder /svc /svc
RUN pip3 install --no-index --find-links=/svc/wheels --requirement 'https://raw.githubusercontent.com/oca/OCB/15.0/requirements.txt' \
- && pip3 install --no-index --find-links=/svc/wheels 'phonenumbers' 'simplejson' 'openupgradelib' 'PyYAML'
+ && pip3 install --upgrade --no-index --find-links=/svc/wheels 'phonenumbers' 'simplejson' 'openupgradelib' 'PyYAML'
ARG SAVE_COMMITS_DIR='/opt/odoo_commits/'
ENV SAVE_COMMITS_DIR=$SAVE_COMMITS_DIR
@@ -63,6 +63,7 @@ RUN set -x; \
COPY --chown=root:root --chmod=755 ./get_addons /usr/local/bin
# Install Odoo OCA default dependencies - Commented modules do not exist yet
+ARG SAVE_COMMITS_FILENAME='default_addons'
RUN set -x; \
get_addons 'https://github.com/OCA/account-financial-reporting' '15.0' 'additional_addons' \
account_tax_balance \
--
GitLab