From 44a540febf97ec4922b0052114aad05e0646a493 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Fri, 9 Dec 2022 15:19:22 +0100
Subject: [PATCH] Fix configuration to prepare for the next version

---
 Dockerfile | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3fc9900..b631691 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,8 @@ RUN apt-get update \
         libmariadb-dev \
         libpng-dev \
         libzip-dev \
+		libc-client-dev \
+		libkrb5-dev \
         zlib1g-dev \
 	&& apt-get autoremove -y \
     && docker-php-ext-install -j$(nproc) iconv \
@@ -22,6 +24,8 @@ RUN apt-get update \
     && docker-php-ext-install -j$(nproc) gd \
     && docker-php-ext-install pdo pdo_mysql mysqli \
     && docker-php-ext-install calendar \
+	&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+	&& docker-php-ext-install imap \
     && docker-php-ext-install zip
 
 ADD php-uploads.ini /usr/local/etc/php/conf.d/glenux-uploads.ini
@@ -31,8 +35,8 @@ ADD php-errors.ini /usr/local/etc/php/conf.d/glenux-errors.ini
 RUN curl -sS https://getcomposer.org/installer \
   | php -- --install-dir=/usr/local/bin --filename=composer
 
-ENV DOLIBARR_VERSION=15.0.1
-# ENV DOLIBARR_VERSION=14.0.5
+ENV DOLIBARR_VERSION=16.0.3
+# ENV DOLIBARR_VERSION=15.0.1
 RUN wget -q \
   -O /tmp/dolibarr-${DOLIBARR_VERSION}.zip \
   https://github.com/Dolibarr/dolibarr/archive/${DOLIBARR_VERSION}.zip
@@ -42,11 +46,17 @@ RUN unzip -d /usr/src /tmp/dolibarr-${DOLIBARR_VERSION}.zip \
 	&& rm -fr /var/www/html \
 	&& cp -a /usr/src/dolibarr-${DOLIBARR_VERSION} /var/www/html
 
+WORKDIR /var/www/html 
+
+RUN pwd \
+ && ls -lh \
+ && mv composer.json.disabled composer.json \
+ && composer install
+
 RUN sed \
   -i 's|/var/www/html|/var/www/html/htdocs|' \
   /etc/apache2/sites-enabled/000-default.conf
 
-WORKDIR /var/www/html 
 
-CMD composer install && apache2-foreground
+CMD apache2-foreground