v7.5.0

espocrm · Jun 20, 2023 · 0fda308 · 0fda308
1 parent 4d38fb2
commit 0fda308
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 49 deletions.
diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -9,6 +9,9 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends \
         libjpeg-dev \
         libpng-dev \
+        libmagickwand-dev \
+        libwebp-dev \
+        libfreetype6-dev \
         libzip-dev \
         libxml2-dev \
         libc-client-dev \
@@ -29,28 +32,37 @@ RUN set -ex; \
     cd .. && rm -rf php-zmq*; \
 # END: Install php-zmq
     \
+    pecl install imagick-3.6.0; \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-    docker-php-ext-install pdo_mysql; \
-    docker-php-ext-install zip; \
-    docker-php-ext-configure gd --with-jpeg; \
-    docker-php-ext-install gd; \
-    PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
-    docker-php-ext-install imap; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-    docker-php-ext-install ldap; \
-    docker-php-ext-install exif; \
-    docker-php-ext-install pcntl; \
-    docker-php-ext-install posix; \
-    docker-php-ext-enable zmq; \
-    docker-php-ext-install bcmath; \
+    docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp; \
+    PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
+    \
+    docker-php-ext-install \
+        pdo_mysql \
+        zip \
+        gd \
+        imap \
+        ldap \
+        exif \
+        pcntl \
+        posix \
+        bcmath \
+    ; \
+    docker-php-ext-enable \
+        zmq \
+        imagick \
+    ; \
+    \
+    rm -r /tmp/pear; \
     \
 # reset a list of apt-mark
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $aptMarkList; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
         | awk '/=>/ { print $3 }' \
         | sort -u \
-        | xargs -r dpkg-query -S \
+        | xargs -r realpath | xargs -r dpkg-query --search \
         | cut -d: -f1 \
         | sort -u \
         | xargs -rt apt-mark manual; \
@@ -81,16 +93,16 @@ RUN { \
 
 RUN a2enmod rewrite;
 
-ENV ESPOCRM_VERSION 7.4.6
-ENV ESPOCRM_SHA256 0d56c073b642b4cea8dc7f5a13b7dce773983d32a53abc9a31abe7ac17db2289
+ENV ESPOCRM_VERSION 7.5.0
+ENV ESPOCRM_SHA256 857edd1d5b5cba2dce8bd3c5c9e7acf3028d525cfef5d14eca126c13af656fde
 
 WORKDIR /var/www/html
 
 RUN set -ex; \
-    curl -fSL "https://www.espocrm.com/downloads/EspoCRM-7.4.6.zip" -o EspoCRM.zip; \
+    curl -fSL "https://www.espocrm.com/downloads/EspoCRM-7.5.0.zip" -o EspoCRM.zip; \
 	echo "${ESPOCRM_SHA256} *EspoCRM.zip" | sha256sum -c -; \
     unzip -q EspoCRM.zip -d /usr/src; \
-    mv "/usr/src/EspoCRM-7.4.6" /usr/src/espocrm; \
+    mv "/usr/src/EspoCRM-7.5.0" /usr/src/espocrm; \
 	rm EspoCRM.zip; \
     chown -R www-data:www-data /usr/src/espocrm
 

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
@@ -27,17 +27,19 @@ RUN set -ex; \
 # END: Install php-zmq
     \
     docker-php-ext-configure gd --with-jpeg --with-webp; \
-    docker-php-ext-install gd; \
-    docker-php-ext-install exif; \
-    docker-php-ext-install ldap; \
-    docker-php-ext-install imap; \
-    docker-php-ext-install pcntl; \
-    docker-php-ext-install zip; \
-    docker-php-ext-install pdo_mysql; \
-    docker-php-ext-install pcntl; \
-    docker-php-ext-install posix; \
-    docker-php-ext-enable zmq; \
-    docker-php-ext-install bcmath
+    \
+    docker-php-ext-install \
+        pdo_mysql \
+        zip \
+        gd \
+        imap \
+        ldap \
+        exif \
+        pcntl \
+        posix \
+        bcmath \
+    ; \
+    docker-php-ext-enable zmq
 
 # php.ini
 RUN { \
@@ -53,16 +55,16 @@ RUN { \
 	echo 'date.timezone=UTC'; \
 } > ${PHP_INI_DIR}/conf.d/espocrm.ini
 
-ENV ESPOCRM_VERSION 7.4.6
-ENV ESPOCRM_SHA256 0d56c073b642b4cea8dc7f5a13b7dce773983d32a53abc9a31abe7ac17db2289
+ENV ESPOCRM_VERSION 7.5.0
+ENV ESPOCRM_SHA256 857edd1d5b5cba2dce8bd3c5c9e7acf3028d525cfef5d14eca126c13af656fde
 
 WORKDIR /var/www/html
 
 RUN set -ex; \
-    curl -fSL "https://www.espocrm.com/downloads/EspoCRM-7.4.6.zip" -o EspoCRM.zip; \
+    curl -fSL "https://www.espocrm.com/downloads/EspoCRM-7.5.0.zip" -o EspoCRM.zip; \
 	echo "${ESPOCRM_SHA256} *EspoCRM.zip" | sha256sum -c -; \
     unzip -q EspoCRM.zip -d /usr/src; \
-    mv "/usr/src/EspoCRM-7.4.6" /usr/src/espocrm; \
+    mv "/usr/src/EspoCRM-7.5.0" /usr/src/espocrm; \
 	rm EspoCRM.zip; \
     chown -R www-data:www-data /usr/src/espocrm
 

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -9,6 +9,9 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends \
         libjpeg-dev \
         libpng-dev \
+        libmagickwand-dev \
+        libwebp-dev \
+        libfreetype6-dev \
         libzip-dev \
         libxml2-dev \
         libc-client-dev \
@@ -29,28 +32,37 @@ RUN set -ex; \
     cd .. && rm -rf php-zmq*; \
 # END: Install php-zmq
     \
+    pecl install imagick-3.6.0; \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-    docker-php-ext-install pdo_mysql; \
-    docker-php-ext-install zip; \
-    docker-php-ext-configure gd --with-jpeg; \
-    docker-php-ext-install gd; \
-    PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
-    docker-php-ext-install imap; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-    docker-php-ext-install ldap; \
-    docker-php-ext-install exif; \
-    docker-php-ext-install pcntl; \
-    docker-php-ext-install posix; \
-    docker-php-ext-enable zmq; \
-    docker-php-ext-install bcmath; \
+    docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp; \
+    PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
+    \
+    docker-php-ext-install \
+        pdo_mysql \
+        zip \
+        gd \
+        imap \
+        ldap \
+        exif \
+        pcntl \
+        posix \
+        bcmath \
+    ; \
+    docker-php-ext-enable \
+        zmq \
+        imagick \
+    ; \
+    \
+    rm -r /tmp/pear; \
     \
 # reset a list of apt-mark
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $aptMarkList; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
         | awk '/=>/ { print $3 }' \
         | sort -u \
-        | xargs -r dpkg-query -S \
+        | xargs -r realpath | xargs -r dpkg-query --search \
         | cut -d: -f1 \
         | sort -u \
         | xargs -rt apt-mark manual; \
@@ -79,16 +91,16 @@ RUN { \
 	echo 'date.timezone=UTC'; \
 } > ${PHP_INI_DIR}/conf.d/espocrm.ini
 
-ENV ESPOCRM_VERSION 7.4.6
-ENV ESPOCRM_SHA256 0d56c073b642b4cea8dc7f5a13b7dce773983d32a53abc9a31abe7ac17db2289
+ENV ESPOCRM_VERSION 7.5.0
+ENV ESPOCRM_SHA256 857edd1d5b5cba2dce8bd3c5c9e7acf3028d525cfef5d14eca126c13af656fde
 
 WORKDIR /var/www/html
 
 RUN set -ex; \
-    curl -fSL "https://www.espocrm.com/downloads/EspoCRM-7.4.6.zip" -o EspoCRM.zip; \
+    curl -fSL "https://www.espocrm.com/downloads/EspoCRM-7.5.0.zip" -o EspoCRM.zip; \
 	echo "${ESPOCRM_SHA256} *EspoCRM.zip" | sha256sum -c -; \
     unzip -q EspoCRM.zip -d /usr/src; \
-    mv "/usr/src/EspoCRM-7.4.6" /usr/src/espocrm; \
+    mv "/usr/src/EspoCRM-7.5.0" /usr/src/espocrm; \
 	rm EspoCRM.zip; \
     chown -R www-data:www-data /usr/src/espocrm