undo changes to v15

Author: Jon Bendtsen

images/15.0.3-php7.4/Dockerfile

@@ -1,72 +1,31 @@
 ARG ARCH=
 
-# ============================================================
-# BUILDER STAGE — compile PHP extensions & fetch Dolibarr
-# ============================================================
-FROM ${ARCH}php:8.2-apache-bookworm AS builder
+# Use a PHP image
+# Example: PHP_BASE_IMAGE=x.y-apache-buster
+# Example: PHP_BASE_IMAGE=x.y-apache-bullseye
+# Note: Version of the PHP image must be a compatible version according to https://wiki.dolibarr.org/index.php?title=Versions
+FROM ${ARCH}php:7.4-apache-bullseye
 
-RUN apt-get update -y \
-    && apt-get dist-upgrade -y \
-    && apt-get install -y --no-install-recommends \
-        libc-client-dev \
-        libfreetype6-dev \
-        libjpeg62-turbo-dev \
-        libkrb5-dev \
-        libldap2-dev \
-        libldap-common \
-        libpng-dev \
-        libpq-dev \
-        libxml2-dev \
-        libzip-dev \
-        libtidy-dev \
-        curl \
-    && docker-php-ext-configure gd --with-freetype --with-jpeg \
-    && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip opcache tidy \
-    && docker-php-ext-configure pgsql -with-pgsql \
-    && docker-php-ext-install pdo_pgsql pgsql \
-    && docker-php-ext-configure ldap --with-libdir=lib/$(gcc -dumpmachine)/ \
-    && docker-php-ext-install -j$(nproc) ldap \
-    && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-    && docker-php-ext-install imap \
-    && rm -rf /var/lib/apt/lists/*
-
-# Download Dolibarr
-ENV DOLI_VERSION=develop
-
-RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz | \
-    tar -C /tmp -xz && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/htdocs/. /var/www/html/ && \
-    ln -s /var/www/html /var/www/htdocs && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/scripts /var/www/ && \
-    rm -rf /tmp/dolibarr-${DOLI_VERSION} && \
-    mkdir -p /var/www/documents && \
-    mkdir -p /var/www/html/custom && \
-    chown -R www-data:www-data /var/www
-
-# ============================================================
-# RUNTIME STAGE — only what's needed to run Dolibarr
-# ============================================================
-FROM ${ARCH}php:8.2-apache-bookworm
-
-# Credit/Initial maintainer: Garcia MICHEL
+# Credit/Initial maintainer: Garcia MICHEL <garcia@soamichel.fr>
 # Modified according to the GPL license by developers of the Dolibarr community:
 # 2024 Alois Micard
 # 2024 Laurent Destailleur
 # 2025 Renato de Castro Ferreira
-
 LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>"
 
-# ---- All original environment variables preserved ----
-ENV DOLI_VERSION=develop
-ENV DOLI_VERSION_FOR_INIT_DEMO=23.0
+ENV DOLI_VERSION=15.0.3
+ENV DOLI_VERSION_FOR_INIT_DEMO=15.0
 ENV DOLI_INSTALL_AUTO=1
 ENV DOLI_PROD=1
+
 ENV DOLI_DB_TYPE=mysqli
 ENV DOLI_DB_HOST=mysql
 ENV DOLI_DB_HOST_PORT=3306
 ENV DOLI_DB_NAME=dolidb
 ENV DOLI_DB_SSL=false
-ENV DOLI_URL_ROOT=''
+
+ENV DOLI_URL_ROOT='http://localhost'
+
 ENV DOLI_AUTH=dolibarr
 ENV DOLI_LDAP_HOST=127.0.0.1
 ENV DOLI_LDAP_PORT=389
@@ -78,67 +37,78 @@ ENV DOLI_LDAP_FILTER=''
 ENV DOLI_LDAP_BIND_DN=''
 ENV DOLI_LDAP_BIND_PASS=''
 ENV DOLI_LDAP_DEBUG=false
+
 ENV DOLI_CRON=0
+
 ENV WWW_USER_ID=33
 ENV WWW_GROUP_ID=33
+
 ENV PHP_INI_DATE_TIMEZONE='UTC'
 ENV PHP_INI_MEMORY_LIMIT=256M
 ENV PHP_INI_UPLOAD_MAX_FILESIZE=20M
 ENV PHP_INI_POST_MAX_SIZE=22M
 ENV PHP_INI_ALLOW_URL_FOPEN=0
 
-# ---- Install ONLY runtime shared libraries (no -dev, no compilers) ----
 RUN apt-get update -y \
     && apt-get dist-upgrade -y \
     && apt-get install -y --no-install-recommends \
-        libc-client2007e \
-        libfreetype6 \
-        libjpeg62-turbo \
-        libkrb5-3 \
-        libldap-2.5-0 \
+        libc-client-dev \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libkrb5-dev \
+        libldap2-dev \
         libldap-common \
-        libpng16-16 \
-        libpq5 \
-        libxml2 \
-        libzip4 \
-        libtidy5deb1 \
+        libpng-dev \
+        libpq-dev \
+        libxml2-dev \
+        libzip-dev \
+        libtidy-dev \
         default-mysql-client \
         postgresql-client \
+        vim-tiny \
         cron \
-    && apt-get remove -y --purge build-essential g++ gcc make binutils cpp \
-    && apt-get remove -y --purge dpkg-dev libc6-dev libc-dev-bin libstdc++-12-dev libgcc-12-dev linux-libc-dev \
-    # 2. Remove Unnecessary Utilities (Safe to remove)
-    && apt-get remove -y --purge re2c autoconf m4 xz-utils \
-    && apt-get autoremove -y \
+    && apt-get autoremove -y
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip opcache tidy \
+    && docker-php-ext-configure pgsql -with-pgsql \
+    && docker-php-ext-install pdo_pgsql pgsql \
+    && docker-php-ext-configure ldap --with-libdir=lib/$(gcc -dumpmachine)/ \
+    && docker-php-ext-install -j$(nproc) ldap \
+    && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && docker-php-ext-install imap \
+    && mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \
+    && sed -i 's/expose_php = On/expose_php = Off/g' ${PHP_INI_DIR}/php.ini \
     && rm -rf /var/lib/apt/lists/*
 
-# ---- Copy compiled PHP extensions + configs from builder ----
-COPY --from=builder /usr/local/lib/php/extensions/ /usr/local/lib/php/extensions/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-
-# ---- Production php.ini + hardening (same as upstream) ----
-RUN mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \
-    && sed -i 's/expose_php = On/expose_php = Off/g' ${PHP_INI_DIR}/php.ini
-
-# ---- Apache hardening (same as upstream) ----
+# Disable useless Apache modules to provide safe defaults
 RUN a2disconf serve-cgi-bin \
     && a2dismod status \
     && a2dismod -f alias \
     && a2dismod -f autoindex \
-    && a2enmod rewrite \
     && sed -i \
-        -e 's/^\(ServerSignature On\)$/#\1/g' \
-        -e 's/^#\(ServerSignature Off\)$/\1/g' \
-        -e 's/^\(ServerTokens\) OS$/\1 Prod/g' \
-        /etc/apache2/conf-available/security.conf
+    -e 's/^\(ServerSignature On\)$/#\1/g' \
+    -e 's/^#\(ServerSignature Off\)$/\1/g' \
+    -e 's/^\(ServerTokens\) OS$/\1 Prod/g' \
+    /etc/apache2/conf-available/security.conf
 
-# ---- Copy Dolibarr application from builder ----
-COPY --from=builder --chown=www-data:www-data /var/www/html /var/www/html
-COPY --from=builder --chown=www-data:www-data /var/www/scripts /var/www/scripts
-COPY --from=builder --chown=www-data:www-data /var/www/documents /var/www/documents
-RUN ln -s /var/www/html /var/www/htdocs
+# Get Dolibarr
+RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\
+    tar -C /tmp -xz && \
+    cp -r /tmp/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && \
+    ln -s /var/www/html /var/www/htdocs && \
+    cp -r /tmp/dolibarr-${DOLI_VERSION}/scripts /var/www/ && \
+    rm -rf /tmp/* && \
+    mkdir -p /var/www/documents && \
+    mkdir -p /var/www/html/custom && \
+    chown -R www-data:www-data /var/www && \
+    chmod -R u-w /var/www/html
 
 EXPOSE 80
-
 VOLUME /var/www/documents
 VOLUME /var/www/html/custom
+
+COPY docker-init.php /var/www/scripts/
+COPY docker-run.sh /usr/local/bin/
+ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]

images/15.0.3-php7.4/docker-init.php

@@ -0,0 +1,49 @@
+#!/usr/bin/env php
+<?php
+# This script is called by the docker-run.sh script to enabled modules during Dolibarr first installation.
+# It is embedded into the Docker image of dolibarr/dolibarr.
+
+require_once '../htdocs/master.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+printf("Activating module User... ");
+activateModule('modUser');
+printf("OK\n");
+
+if (!empty(getenv('DOLI_COMPANY_COUNTRYCODE'))) {
+  require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+  require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
+  $countryCode = getenv('DOLI_COMPANY_COUNTRYCODE');
+  $country = new Ccountry($db);
+  $res = $country->fetch(0,$countryCode);
+  if ($res > 0 ) {
+    $s = $country->id.':'.$country->code.':'.$country->label;
+    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_COUNTRY", $s, 'chaine', 0, '', $conf->entity);
+    printf('Configuring for country : '.$s."\n");
+    activateModulesRequiredByCountry($country->code);
+  } else {
+    printf('Unable to find country '.$countryCode."\n");
+  }
+}
+
+if (!empty(getenv('DOLI_COMPANY_NAME'))) {
+  $compname = getenv('DOLI_COMPANY_NAME');
+  dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", $compname, 'chaine', 0, '', $conf->entity);
+}
+
+if (!empty(getenv('DOLI_ENABLE_MODULES'))) {
+  $mods = explode(',', getenv('DOLI_ENABLE_MODULES'));
+  foreach ($mods as $mod) {
+    printf("Activating module ".$mod." ...");
+    try {
+      $res = activateModule('mod' . $mod);
+      if ($res < 0) {
+        print(" FAILED. Unable to load module. Be sure to check the case\n");
+      } else {
+        printf(" OK\n");
+      }
+    } catch (Throwable $t) {
+      print(" FAILED. Unable to load module. Be sure to check the case\n");
+    }
+  }
+}