From d439fc1fcb7ee70528a7c34c6c5d1ef23c8cae0a Mon Sep 17 00:00:00 2001
From: hpl <fab@kaz.bzh>
Date: Sun, 5 Jan 2025 18:55:27 +0100
Subject: [PATCH] plugin facturation : zip au lieu du tar.gz

---
 dockers/paheko/Dockerfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/dockers/paheko/Dockerfile b/dockers/paheko/Dockerfile
index 97b6ab5..9406268 100644
--- a/dockers/paheko/Dockerfile
+++ b/dockers/paheko/Dockerfile
@@ -1,6 +1,5 @@
 FROM paheko/paheko:1.3.12
 
-#ENV PAHEKO_DIR /usr/share/paheko
 ENV PAHEKO_DIR /var/www/paheko
 
 COPY dockers/paheko/config/factory_cron.sh ${PAHEKO_DIR}/
@@ -8,15 +7,22 @@ COPY dockers/paheko/config/factory_cron_emails.sh ${PAHEKO_DIR}/
 COPY dockers/paheko/config/setupWebRights.sh ${PAHEKO_DIR}/
 RUN mkdir ${PAHEKO_DIR}/users
 
-#Plugin facturation (le seul qui ne fasse pas parti de la distribution de base
-COPY "dockers/paheko/config/facturation.tar.gz" ${PAHEKO_DIR}/data/plugins/
-RUN mkdir ${PAHEKO_DIR}/data/plugins/facturation && tar zxvf ${PAHEKO_DIR}/data/plugins/facturation.tar.gz -C ${PAHEKO_DIR}/data/plugins/facturation && rm ${PAHEKO_DIR}/data/plugins/facturation.tar.gz
-
 #pour corriger le bug "export excel"
 RUN docker-php-ext-install calendar
 
+RUN apt-get update
+
+#Plugin facturation (le seul qui ne fasse pas parti de la distribution de base
+RUN apt-get install unzip
+COPY "dockers/paheko/config/facturation.zip" ${PAHEKO_DIR}/data/plugins/
+WORKDIR ${PAHEKO_DIR}/data/plugins/
+RUN unzip ${PAHEKO_DIR}/data/plugins/facturation.zip
+WORKDIR /
+
+#RUN mkdir ${PAHEKO_DIR}/data/plugins/facturation && tar zxvf ${PAHEKO_DIR}/data/plugins/facturation.tar.gz -C ${PAHEKO_DIR}/data/plugins/facturation && rm ${PAHEKO_DIR}/data/plugins/facturation.tar.gz
+
 #install cron pour factory_cron.sh
-RUN apt-get update && apt-get install cron joe rsyslog -y
+RUN apt-get install cron joe rsyslog -y
 RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
 RUN echo "0 1 * * * cd ${PAHEKO_DIR} && ${PAHEKO_DIR}/factory_cron.sh 1> /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
 RUN echo "* * * * *  cd ${PAHEKO_DIR} && ${PAHEKO_DIR}/factory_cron_emails.sh 1> /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root