Skip to content

Commit 6da4079

Browse files
tmachyshyntmachyshyn
committed
Release 6.1.8
1 parent 949a79e commit 6da4079

15 files changed

+312
-50
lines changed

‎apache/Dockerfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.3-apache
1+
FROM php:7.4-apache
22

33
# Install php libs
44
RUN set -ex; \
@@ -9,6 +9,8 @@ RUN set -ex; \
99
apt-get install -y --no-install-recommends \
1010
libjpeg-dev \
1111
libpng-dev \
12+
libwebp-dev \
13+
libfreetype6-dev \
1214
libzip-dev \
1315
libxml2-dev \
1416
libc-client-dev \
@@ -32,13 +34,15 @@ RUN set -ex; \
3234
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
3335
docker-php-ext-install pdo_mysql; \
3436
docker-php-ext-install zip; \
35-
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
37+
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
3638
docker-php-ext-install gd; \
3739
docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
3840
docker-php-ext-install imap; \
3941
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
4042
docker-php-ext-install ldap; \
4143
docker-php-ext-install exif; \
44+
docker-php-ext-install pcntl; \
45+
docker-php-ext-install posix; \
4246
docker-php-ext-enable zmq; \
4347
\
4448
# reset a list of apt-mark
@@ -58,12 +62,8 @@ RUN set -ex; \
5862
RUN set -ex; \
5963
apt-get install -y --no-install-recommends \
6064
unzip \
61-
busybox-static \
6265
; \
63-
rm -rf /var/lib/apt/lists/*; \
64-
\
65-
mkdir -p /var/spool/cron/crontabs; \
66-
echo '* * * * * cd /var/www/html; /usr/local/bin/php -f cron.php > /dev/null 2>&1' > /var/spool/cron/crontabs/www-data
66+
rm -rf /var/lib/apt/lists/*
6767

6868
# php.ini
6969
RUN { \
@@ -81,22 +81,22 @@ RUN { \
8181

8282
RUN a2enmod rewrite;
8383

84-
ENV ESPOCRM_VERSION 6.1.7
85-
ENV ESPOCRM_SHA256 329b24bf5d91bd843aee142de9e39f768c974ffd3228bcb905d17b91665a2ed3
84+
ENV ESPOCRM_VERSION 6.1.8
85+
ENV ESPOCRM_SHA256 97d7110f5ffddbf6c65b1e727d077a36844cf9e434c6123533762a8deb8d5cf2
8686

8787
WORKDIR /var/www/html
8888

8989
RUN set -ex; \
90-
curl -fSL "https://www.espocrm.com/downloads/EspoCRM-6.1.7.zip" -o EspoCRM.zip; \
90+
curl -fSL "https://www.espocrm.com/downloads/EspoCRM-6.1.8.zip" -o EspoCRM.zip; \
9191
echo "${ESPOCRM_SHA256} *EspoCRM.zip" | sha256sum -c -; \
9292
unzip -q EspoCRM.zip -d /usr/src; \
93-
mv "/usr/src/EspoCRM-6.1.7" /usr/src/espocrm; \
93+
mv "/usr/src/EspoCRM-6.1.8" /usr/src/espocrm; \
9494
rm EspoCRM.zip; \
9595
mkdir /usr/src/espocrm-upgrades; \
9696
chown -R www-data:www-data /usr/src/espocrm /usr/src/espocrm-upgrades
9797

98-
COPY ./docker-entrypoint.sh /usr/local/bin/
99-
COPY ./docker-cron.sh /usr/local/bin/
98+
COPY ./docker-*.sh /usr/local/bin/
99+
100100
ENTRYPOINT [ "docker-entrypoint.sh" ]
101101

102102
CMD ["apache2-foreground"]

‎apache/docker-cron.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎apache/docker-daemon.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
set -eu
4+
5+
/usr/local/bin/php /var/www/html/daemon.php
6+
7+
exec "$@"

‎apache/docker-entrypoint.sh

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ installEspocrm() {
132132
runInstallationStep "savePreferences" "$(join '&' "${preferences[@]}")"
133133
runInstallationStep "finish"
134134

135+
saveConfigParam "jobRunInParallel" "true"
136+
135137
echo >&2 "End EspoCRM installation"
136138
}
137139

@@ -158,6 +160,41 @@ runInstallationStep() {
158160
fi
159161
}
160162

163+
# Bool: saveConfigParam "jobRunInParallel" "true"
164+
# String: saveConfigParam "language" "'en_US'"
165+
saveConfigParam() {
166+
local name="$1"
167+
local value="$2"
168+
169+
php -r "
170+
require_once('$DOCUMENT_ROOT/bootstrap.php');
171+
172+
\$app = new \Espo\Core\Application();
173+
\$config = \$app->getContainer()->get('config');
174+
175+
if (\$config->get('$name') !== $value) {
176+
\$config->set('$name', $value);
177+
\$config->save();
178+
}
179+
"
180+
}
181+
182+
applyEnvironments() {
183+
declare -A configParams=(
184+
['webSocketZeroMQSubmissionDsn']='ESPOCRM_ENV_WEBSOCKET_SUBMISSION_DSN'
185+
['webSocketZeroMQSubscriberDsn']='ESPOCRM_ENV_WEBSOCKET_SUBSCRIBER_DSN'
186+
)
187+
188+
for paramName in "${!configParams[@]}"
189+
do
190+
local envName="${configParams[$paramName]}"
191+
192+
if [ -n "${!envName-}" ]; then
193+
saveConfigParam "$paramName" "'${!envName}'"
194+
fi
195+
done
196+
}
197+
161198
# ------------------------- START -------------------------------------
162199
# Global variables
163200
DOCUMENT_ROOT="/var/www/html"
@@ -239,6 +276,8 @@ case $installationType in
239276
exit 1
240277
;;
241278
esac
279+
280+
applyEnvironments
242281
# ------------------------- END -------------------------------------
243282

244283
exec "$@"

‎apache/docker-websocket.sh

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#!/bin/bash
2+
3+
set -eu
4+
5+
DOCUMENT_ROOT="/var/www/html"
6+
7+
# see docker-entrypoint.sh
8+
saveConfigParam() {
9+
local name="$1"
10+
local value="$2"
11+
12+
php -r "
13+
require_once('$DOCUMENT_ROOT/bootstrap.php');
14+
15+
\$app = new \Espo\Core\Application();
16+
\$config = \$app->getContainer()->get('config');
17+
18+
if (\$config->get('$name') !== $value) {
19+
\$config->set('$name', $value);
20+
\$config->save();
21+
}
22+
"
23+
}
24+
25+
# see docker-entrypoint.sh
26+
applyEnvironments() {
27+
declare -A configParams=(
28+
['webSocketZeroMQSubmissionDsn']='ESPOCRM_ENV_WEBSOCKET_SUBMISSION_DSN'
29+
['webSocketZeroMQSubscriberDsn']='ESPOCRM_ENV_WEBSOCKET_SUBSCRIBER_DSN'
30+
)
31+
32+
for paramName in "${!configParams[@]}"
33+
do
34+
local envName="${configParams[$paramName]}"
35+
36+
if [ -n "${!envName-}" ]; then
37+
saveConfigParam "$paramName" "'${!envName}'"
38+
fi
39+
done
40+
}
41+
42+
applyEnvironments
43+
44+
/usr/local/bin/php /var/www/html/websocket.php
45+
46+
exec "$@"

‎fpm-alpine/Dockerfile

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.3-fpm-alpine
1+
FROM php:7.4-fpm-alpine
22

33
# Install php libs
44
RUN set -ex; \
@@ -26,20 +26,18 @@ RUN set -ex; \
2626
cd .. && rm -rf php-zmq*; \
2727
# END: Install php-zmq
2828
\
29-
docker-php-ext-configure gd --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/; \
29+
docker-php-ext-configure gd --with-jpeg --with-webp; \
3030
docker-php-ext-install gd; \
3131
docker-php-ext-install exif; \
3232
docker-php-ext-install ldap; \
3333
docker-php-ext-install imap; \
3434
docker-php-ext-install pcntl; \
3535
docker-php-ext-install zip; \
3636
docker-php-ext-install pdo_mysql; \
37+
docker-php-ext-install pcntl; \
38+
docker-php-ext-install posix; \
3739
docker-php-ext-enable zmq
3840

39-
RUN set -ex; \
40-
rm /var/spool/cron/crontabs/root; \
41-
echo '* * * * * cd /var/www/html; /usr/local/bin/php -f cron.php > /dev/null 2>&1' > /var/spool/cron/crontabs/www-data
42-
4341
# php.ini
4442
RUN { \
4543
echo 'expose_php = Off'; \
@@ -54,22 +52,22 @@ RUN { \
5452
echo 'date.timezone=UTC'; \
5553
} > ${PHP_INI_DIR}/conf.d/espocrm.ini
5654

57-
ENV ESPOCRM_VERSION 6.1.7
58-
ENV ESPOCRM_SHA256 329b24bf5d91bd843aee142de9e39f768c974ffd3228bcb905d17b91665a2ed3
55+
ENV ESPOCRM_VERSION 6.1.8
56+
ENV ESPOCRM_SHA256 97d7110f5ffddbf6c65b1e727d077a36844cf9e434c6123533762a8deb8d5cf2
5957

6058
WORKDIR /var/www/html
6159

6260
RUN set -ex; \
63-
curl -fSL "https://www.espocrm.com/downloads/EspoCRM-6.1.7.zip" -o EspoCRM.zip; \
61+
curl -fSL "https://www.espocrm.com/downloads/EspoCRM-6.1.8.zip" -o EspoCRM.zip; \
6462
echo "${ESPOCRM_SHA256} *EspoCRM.zip" | sha256sum -c -; \
6563
unzip -q EspoCRM.zip -d /usr/src; \
66-
mv "/usr/src/EspoCRM-6.1.7" /usr/src/espocrm; \
64+
mv "/usr/src/EspoCRM-6.1.8" /usr/src/espocrm; \
6765
rm EspoCRM.zip; \
6866
mkdir /usr/src/espocrm-upgrades; \
6967
chown -R www-data:www-data /usr/src/espocrm /usr/src/espocrm-upgrades
7068

71-
COPY ./docker-entrypoint.sh /usr/local/bin/
72-
COPY ./docker-cron.sh /usr/local/bin/
69+
COPY ./docker-*.sh /usr/local/bin/
70+
7371
ENTRYPOINT [ "docker-entrypoint.sh" ]
7472

7573
CMD ["php-fpm"]

‎fpm-alpine/docker-cron.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎fpm-alpine/docker-daemon.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
set -eu
4+
5+
/usr/local/bin/php /var/www/html/daemon.php
6+
7+
exec "$@"

‎fpm-alpine/docker-entrypoint.sh

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ installEspocrm() {
132132
runInstallationStep "savePreferences" "$(join '&' "${preferences[@]}")"
133133
runInstallationStep "finish"
134134

135+
saveConfigParam "jobRunInParallel" "true"
136+
135137
echo >&2 "End EspoCRM installation"
136138
}
137139

@@ -158,6 +160,41 @@ runInstallationStep() {
158160
fi
159161
}
160162

163+
# Bool: saveConfigParam "jobRunInParallel" "true"
164+
# String: saveConfigParam "language" "'en_US'"
165+
saveConfigParam() {
166+
local name="$1"
167+
local value="$2"
168+
169+
php -r "
170+
require_once('$DOCUMENT_ROOT/bootstrap.php');
171+
172+
\$app = new \Espo\Core\Application();
173+
\$config = \$app->getContainer()->get('config');
174+
175+
if (\$config->get('$name') !== $value) {
176+
\$config->set('$name', $value);
177+
\$config->save();
178+
}
179+
"
180+
}
181+
182+
applyEnvironments() {
183+
declare -A configParams=(
184+
['webSocketZeroMQSubmissionDsn']='ESPOCRM_ENV_WEBSOCKET_SUBMISSION_DSN'
185+
['webSocketZeroMQSubscriberDsn']='ESPOCRM_ENV_WEBSOCKET_SUBSCRIBER_DSN'
186+
)
187+
188+
for paramName in "${!configParams[@]}"
189+
do
190+
local envName="${configParams[$paramName]}"
191+
192+
if [ -n "${!envName-}" ]; then
193+
saveConfigParam "$paramName" "'${!envName}'"
194+
fi
195+
done
196+
}
197+
161198
# ------------------------- START -------------------------------------
162199
# Global variables
163200
DOCUMENT_ROOT="/var/www/html"
@@ -239,6 +276,8 @@ case $installationType in
239276
exit 1
240277
;;
241278
esac
279+
280+
applyEnvironments
242281
# ------------------------- END -------------------------------------
243282

244283
exec "$@"

‎fpm-alpine/docker-websocket.sh

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#!/bin/bash
2+
3+
set -eu
4+
5+
DOCUMENT_ROOT="/var/www/html"
6+
7+
# see docker-entrypoint.sh
8+
saveConfigParam() {
9+
local name="$1"
10+
local value="$2"
11+
12+
php -r "
13+
require_once('$DOCUMENT_ROOT/bootstrap.php');
14+
15+
\$app = new \Espo\Core\Application();
16+
\$config = \$app->getContainer()->get('config');
17+
18+
if (\$config->get('$name') !== $value) {
19+
\$config->set('$name', $value);
20+
\$config->save();
21+
}
22+
"
23+
}
24+
25+
# see docker-entrypoint.sh
26+
applyEnvironments() {
27+
declare -A configParams=(
28+
['webSocketZeroMQSubmissionDsn']='ESPOCRM_ENV_WEBSOCKET_SUBMISSION_DSN'
29+
['webSocketZeroMQSubscriberDsn']='ESPOCRM_ENV_WEBSOCKET_SUBSCRIBER_DSN'
30+
)
31+
32+
for paramName in "${!configParams[@]}"
33+
do
34+
local envName="${configParams[$paramName]}"
35+
36+
if [ -n "${!envName-}" ]; then
37+
saveConfigParam "$paramName" "'${!envName}'"
38+
fi
39+
done
40+
}
41+
42+
applyEnvironments
43+
44+
/usr/local/bin/php /var/www/html/websocket.php
45+
46+
exec "$@"

0 commit comments

Comments
 (0)