From e3e83084162d7a0008bf1a585434df2644b09e72 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Sun, 13 Mar 2022 12:25:40 +0100
Subject: [PATCH] php-fpm debian image

---
 _CI-CD/debian-stable-php-fpm/Dockerfile |  8 ++++++--
 apps/dolibarr/Dockerfile                | 11 ++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/_CI-CD/debian-stable-php-fpm/Dockerfile b/_CI-CD/debian-stable-php-fpm/Dockerfile
index 04eb240..bb4b768 100644
--- a/_CI-CD/debian-stable-php-fpm/Dockerfile
+++ b/_CI-CD/debian-stable-php-fpm/Dockerfile
@@ -1,5 +1,6 @@
 FROM cr.lan/debian-stable
 
+ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y \
 	dnsutils procps nmap bash iputils-ping bash openssl \
 	php-fpm php-zip php-sqlite3 php-pgsql php-mysqli php-json php-readline \
@@ -7,8 +8,11 @@ RUN apt-get update && apt-get install -y \
 	php-bz2 php-mbstring php-memcache php-redis
 	
 #cleanup
-RUN	apt-get clean -y && \ 
-	rm -rf /var/lib/apt/lists/* && \
+RUN	apt-get remove -y --purge man-db ;\
+	apt-get autoremove -y --purge ;\ 
+	apt-get clean -y ;\ 
+	rm -rf /var/lib/apt/lists/* ;\
 	rm -rf /var/cache/apt/*
+	
 ADD docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]
\ No newline at end of file
diff --git a/apps/dolibarr/Dockerfile b/apps/dolibarr/Dockerfile
index cd2bc79..39cc487 100644
--- a/apps/dolibarr/Dockerfile
+++ b/apps/dolibarr/Dockerfile
@@ -1,12 +1,8 @@
-FROM cr.lan/debian-stable
+FROM cr.lan/debian-stable-php-fpm
 
-# Install the packages we need
-# Install the PHP extensions we need
 # see https://wiki.dolibarr.org/index.php/Dependencies_and_external_libraries
 # Prepare folders
 ENV DEBIAN_FRONTEND noninteractive
-RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \
-	sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list
 RUN set -ex; \
 	apt-get update -q; \
 	apt-get install -y --no-install-recommends \
@@ -16,9 +12,7 @@ RUN set -ex; \
 		cron \
 		rsync \
 		unzip \
-		zip \
-		unzip \
-		php-ldap php-gd php-imagick php-intl php-zip php-bz2 php-mbstring php-pgsql ;\ 
+		zip ;\
 	#debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	#docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	#docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@@ -38,7 +32,6 @@ RUN set -ex; \
 	#	soap \
 	#	zip \
 	#; \
-	rm -rf /var/lib/apt/lists/*; \
 	mkdir -p /var/www/documents; \
 	chown -R www-data:root /var/www; \
 	chmod -R g=u /var/www