From 81fd20c8f5eb3b3add577e680db7a1a4331bb1b5 Mon Sep 17 00:00:00 2001
From: alexandre <achichmanian@linagora.com>
Date: Wed, 19 Feb 2020 18:25:50 -0500
Subject: [PATCH] Fix issue missing files at container restart

---
 2.6/Dockerfile                   |  4 ++--
 2.6/scripts/docker-entrypoint.sh | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/2.6/Dockerfile b/2.6/Dockerfile
index 3fb9dfc..59af5cc 100644
--- a/2.6/Dockerfile
+++ b/2.6/Dockerfile
@@ -61,9 +61,9 @@ RUN yum ${YUM_FLAGS} install wget \
     php73-php-fpm \
     php73-php-opcache ;
 
-COPY conf/* /tmp/
+COPY conf/ /tmp/conf
 COPY ./scripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
 
 EXPOSE 80 443
 
-ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
diff --git a/2.6/scripts/docker-entrypoint.sh b/2.6/scripts/docker-entrypoint.sh
index cd9d803..028b8e2 100755
--- a/2.6/scripts/docker-entrypoint.sh
+++ b/2.6/scripts/docker-entrypoint.sh
@@ -28,7 +28,7 @@ cd ..
 cp -R ocsreports/* $OCS_WEBCONSOLE_DIR
 
 # Configure z-ocsinventory-server file 
-cp /tmp/ocsinventory-server.conf /etc/httpd/conf.d/z-ocsinventory-server.conf
+cp /tmp/conf/ocsinventory-server.conf /etc/httpd/conf.d/z-ocsinventory-server.conf
 sed -i 's/VERSION_MP/2/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
 sed -i 's/DATABASE_SERVER/'"$OCS_DB_SERVER"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
 sed -i 's/DATABASE_PORT/'"$OCS_DB_PORT"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
@@ -40,7 +40,7 @@ sed -i 's/"PATH_TO_PLUGINS_PERL_DIRECTORY"/'"${OCS_PERLEXT_DIR//\//\\/}"'/g' /et
 sed -i 's/"PATH_TO_PLUGINS_CONFIG_DIRECTORY"/'"${OCS_PLUGINSEXT_DIR//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
 
 # Configure ocsinventory-reports file 
-cp /tmp/ocsinventory-reports.conf /etc/httpd/conf.d/ocsinventory-reports.conf
+cp /tmp/conf/ocsinventory-reports.conf /etc/httpd/conf.d/ocsinventory-reports.conf
 sed -i 's/OCSREPORTS_ALIAS/\/ocsreports/g' /etc/httpd/conf.d/ocsinventory-reports.conf
 sed -i 's/PATH_TO_OCSREPORTS_DIR/'"${OCS_WEBCONSOLE_DIR//\//\\/}"'/g' /etc/httpd/conf.d/ocsinventory-reports.conf
 sed -i 's/PACKAGES_ALIAS/\/download/g' /etc/httpd/conf.d/ocsinventory-reports.conf
@@ -49,7 +49,7 @@ sed -i 's/SNMP_ALIAS/\/snmp/g' /etc/httpd/conf.d/ocsinventory-reports.conf
 sed -i 's/PATH_TO_SNMP_DIR/'"${OCS_VARLIB_DIR//\//\\/}"'snmp/g' /etc/httpd/conf.d/ocsinventory-reports.conf
 
 # Generate dbconfig.inc.php
-cp /tmp/dbconfig.inc.php $OCS_WEBCONSOLE_DIR
+cp /tmp/conf/dbconfig.inc.php $OCS_WEBCONSOLE_DIR
 sed -i 's/OCS_DB_NAME/'"$OCS_DB_NAME"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php
 sed -i 's/OCS_READ_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php
 sed -i 's/OCS_WRITE_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php
@@ -65,7 +65,9 @@ chown -R $APACHE_RUN_USER: $OCS_WEBCONSOLE_DIR
 rm $OCS_WEBCONSOLE_DIR/install.php
 
 # Remove temp files
-rm -rf /tmp/*
+cd /tmp
+shopt -s extglob
+rm -rf -v !("conf")
 
 # Apache start
 if [ ! -d "$APACHE_RUN_DIR" ]; then
@@ -76,4 +78,4 @@ if [ -f "$APACHE_PID_FILE" ]; then
 	rm "$APACHE_PID_FILE"
 fi
 
-/usr/sbin/httpd -DFOREGROUND
\ No newline at end of file
+/usr/sbin/httpd -DFOREGROUND