From de9e3c4602cd3445b599e2774d240fa637b279da Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Sat, 12 Mar 2022 14:35:29 +0100
Subject: [PATCH] dolibarr CRM

---
 apps/dolibarr/Dockerfile | 73 +++++++++++-----------------------------
 1 file changed, 20 insertions(+), 53 deletions(-)

diff --git a/apps/dolibarr/Dockerfile b/apps/dolibarr/Dockerfile
index e91ab20..f999fcf 100644
--- a/apps/dolibarr/Dockerfile
+++ b/apps/dolibarr/Dockerfile
@@ -15,46 +15,29 @@ RUN set -ex; \
 		default-mysql-client \
 		cron \
 		rsync \
-		sendmail \
 		unzip \
 		zip \
-	; \
-	apt-get install -y --no-install-recommends \
-		g++ \
-		libcurl4-openssl-dev \
-		libfreetype6-dev \
-		libicu-dev \
-		libjpeg-dev \
-		libldap2-dev \
-		libmagickcore-dev \
-		libmagickwand-dev \
-		libmcrypt-dev \
-		libpng-dev \
-		libpq-dev \
-		libxml2-dev \
-		libzip-dev \
 		unzip \
-		zlib1g-dev \
-	; \
-	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; \
-	docker-php-ext-configure intl; \
-	docker-php-ext-configure zip --with-libzip; \
-	docker-php-ext-install -j "$(nproc)" \
-		calendar \
-		gd \
-		intl \
-		ldap \
-		mbstring \
-		mysqli \
-		pdo \
-		pdo_mysql \
-		pdo_pgsql \
-		pgsql \
-		soap \
-		zip \
-	; \
+		php-ldap php-gd php-imagick php-intl php-zip php-bzip2 php-mbstring php-mysql php-psql ;\ 
+	#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; \
+	#docker-php-ext-configure intl; \
+	#docker-php-ext-configure zip --with-libzip; \
+	#docker-php-ext-install -j "$(nproc)" \
+	#	calendar \
+	#	gd \
+	#	intl \
+	#	ldap \
+	#	mbstring \
+	#	mysqli \
+	#	pdo \
+	#	pdo_mysql \
+	#	pdo_pgsql \
+	#	pgsql \
+	#	soap \
+	#	zip \
+	#; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
 	rm -rf /var/lib/apt/lists/*; \
@@ -68,22 +51,6 @@ RUN	apt-get autoremove --purge -y && \
 	rm -rf /var/lib/apt/lists/* && \
 	rm -rf /var/cache/apt/* /tmp/* /var/tmp/* /var/log/*
 	
-RUN	apt-get uninstall -y --no-install-recommends \
-		g++ \
-		libcurl4-openssl-dev \
-		libfreetype6-dev \
-		libicu-dev \
-		libjpeg-dev \
-		libldap2-dev \
-		libmagickcore-dev \
-		libmagickwand-dev \
-		libmcrypt-dev \
-		libpng-dev \
-		libpq-dev \
-		libxml2-dev \
-		libzip-dev \
-		unzip \
-		zlib1g-dev	
 	
 VOLUME /var/www/html /var/www/documents /var/www/scripts