Skip to content

Commit 541e2ea

Browse files
tmachyshyntmachyshyn
committed
v8.2.5
1 parent a354843 commit 541e2ea

File tree

6 files changed

+39
-18
lines changed

6 files changed

+39
-18
lines changed

‎apache/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,16 @@ RUN { \
9696

9797
RUN a2enmod rewrite;
9898

99-
ENV ESPOCRM_VERSION 8.2.4
100-
ENV ESPOCRM_SHA256 db911f9f58a93e72bc73ecb556aa1568944e68a6f69a32fde4d769be8ea45aa9
99+
ENV ESPOCRM_VERSION 8.2.5
100+
ENV ESPOCRM_SHA256 c48b57369d08805eb8b7b2180b5afd567fcf39b622a9239ceda70193fe29186c
101101

102102
WORKDIR /var/www/html
103103

104104
RUN set -ex; \
105-
curl -fSL "https://www.espocrm.com/downloads/EspoCRM-8.2.4.zip" -o EspoCRM.zip; \
105+
curl -fSL "https://www.espocrm.com/downloads/EspoCRM-8.2.5.zip" -o EspoCRM.zip; \
106106
echo "${ESPOCRM_SHA256} *EspoCRM.zip" | sha256sum -c -; \
107107
unzip -q EspoCRM.zip -d /usr/src; \
108-
mv "/usr/src/EspoCRM-8.2.4" /usr/src/espocrm; \
108+
mv "/usr/src/EspoCRM-8.2.5" /usr/src/espocrm; \
109109
rm EspoCRM.zip; \
110110
chown -R www-data:www-data /usr/src/espocrm
111111

‎apache/docker-entrypoint.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,15 @@ installEspocrm() {
412412

413413
runInstallationStep "step1" "user-lang=${ESPOCRM_LANGUAGE}"
414414

415+
local databaseHost="${ESPOCRM_DATABASE_HOST}"
416+
417+
if [ -n "$ESPOCRM_DATABASE_PORT" ]; then
418+
databaseHost="${ESPOCRM_DATABASE_HOST}:${ESPOCRM_DATABASE_PORT}"
419+
fi
420+
415421
for i in {1..20}
416422
do
417-
settingsTestResult=$(runInstallationStep "settingsTest" "dbPlatform=${ESPOCRM_DATABASE_PLATFORM}&hostName=${ESPOCRM_DATABASE_HOST}&dbName=${ESPOCRM_DATABASE_NAME}&dbUserName=${ESPOCRM_DATABASE_USER}&dbUserPass=${ESPOCRM_DATABASE_PASSWORD}" true 2>&1)
423+
settingsTestResult=$(runInstallationStep "settingsTest" "dbPlatform=${ESPOCRM_DATABASE_PLATFORM}&hostName=${databaseHost}&dbName=${ESPOCRM_DATABASE_NAME}&dbUserName=${ESPOCRM_DATABASE_USER}&dbUserPass=${ESPOCRM_DATABASE_PASSWORD}" true 2>&1)
418424

419425
if [[ ! "$settingsTestResult" == *"Error:"* ]]; then
420426
break
@@ -428,7 +434,7 @@ installEspocrm() {
428434
return
429435
fi
430436

431-
runInstallationStep "setupConfirmation" "db-platform=${ESPOCRM_DATABASE_PLATFORM}&host-name=${ESPOCRM_DATABASE_HOST}&db-name=${ESPOCRM_DATABASE_NAME}&db-user-name=${ESPOCRM_DATABASE_USER}&db-user-password=${ESPOCRM_DATABASE_PASSWORD}"
437+
runInstallationStep "setupConfirmation" "db-platform=${ESPOCRM_DATABASE_PLATFORM}&host-name=${databaseHost}&db-name=${ESPOCRM_DATABASE_NAME}&db-user-name=${ESPOCRM_DATABASE_USER}&db-user-password=${ESPOCRM_DATABASE_PASSWORD}"
432438
runInstallationStep "checkPermission"
433439
runInstallationStep "saveSettings" "site-url=${ESPOCRM_SITE_URL}&default-permissions-user=${DEFAULT_OWNER}&default-permissions-group=${DEFAULT_GROUP}"
434440
runInstallationStep "buildDatabase"
@@ -489,6 +495,7 @@ fi
489495
declare -A DEFAULTS=(
490496
['ESPOCRM_DATABASE_PLATFORM']='Mysql'
491497
['ESPOCRM_DATABASE_HOST']='mysql'
498+
['ESPOCRM_DATABASE_PORT']=''
492499
['ESPOCRM_DATABASE_NAME']='espocrm'
493500
['ESPOCRM_DATABASE_USER']='root'
494501
['ESPOCRM_DATABASE_PASSWORD']='password'

‎fpm-alpine/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ RUN { \
6161
echo 'date.timezone=UTC'; \
6262
} > ${PHP_INI_DIR}/conf.d/espocrm.ini
6363

64-
ENV ESPOCRM_VERSION 8.2.4
65-
ENV ESPOCRM_SHA256 db911f9f58a93e72bc73ecb556aa1568944e68a6f69a32fde4d769be8ea45aa9
64+
ENV ESPOCRM_VERSION 8.2.5
65+
ENV ESPOCRM_SHA256 c48b57369d08805eb8b7b2180b5afd567fcf39b622a9239ceda70193fe29186c
6666

6767
WORKDIR /var/www/html
6868

6969
RUN set -ex; \
70-
curl -fSL "https://www.espocrm.com/downloads/EspoCRM-8.2.4.zip" -o EspoCRM.zip; \
70+
curl -fSL "https://www.espocrm.com/downloads/EspoCRM-8.2.5.zip" -o EspoCRM.zip; \
7171
echo "${ESPOCRM_SHA256} *EspoCRM.zip" | sha256sum -c -; \
7272
unzip -q EspoCRM.zip -d /usr/src; \
73-
mv "/usr/src/EspoCRM-8.2.4" /usr/src/espocrm; \
73+
mv "/usr/src/EspoCRM-8.2.5" /usr/src/espocrm; \
7474
rm EspoCRM.zip; \
7575
chown -R www-data:www-data /usr/src/espocrm
7676

‎fpm-alpine/docker-entrypoint.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,15 @@ installEspocrm() {
412412

413413
runInstallationStep "step1" "user-lang=${ESPOCRM_LANGUAGE}"
414414

415+
local databaseHost="${ESPOCRM_DATABASE_HOST}"
416+
417+
if [ -n "$ESPOCRM_DATABASE_PORT" ]; then
418+
databaseHost="${ESPOCRM_DATABASE_HOST}:${ESPOCRM_DATABASE_PORT}"
419+
fi
420+
415421
for i in {1..20}
416422
do
417-
settingsTestResult=$(runInstallationStep "settingsTest" "dbPlatform=${ESPOCRM_DATABASE_PLATFORM}&hostName=${ESPOCRM_DATABASE_HOST}&dbName=${ESPOCRM_DATABASE_NAME}&dbUserName=${ESPOCRM_DATABASE_USER}&dbUserPass=${ESPOCRM_DATABASE_PASSWORD}" true 2>&1)
423+
settingsTestResult=$(runInstallationStep "settingsTest" "dbPlatform=${ESPOCRM_DATABASE_PLATFORM}&hostName=${databaseHost}&dbName=${ESPOCRM_DATABASE_NAME}&dbUserName=${ESPOCRM_DATABASE_USER}&dbUserPass=${ESPOCRM_DATABASE_PASSWORD}" true 2>&1)
418424

419425
if [[ ! "$settingsTestResult" == *"Error:"* ]]; then
420426
break
@@ -428,7 +434,7 @@ installEspocrm() {
428434
return
429435
fi
430436

431-
runInstallationStep "setupConfirmation" "db-platform=${ESPOCRM_DATABASE_PLATFORM}&host-name=${ESPOCRM_DATABASE_HOST}&db-name=${ESPOCRM_DATABASE_NAME}&db-user-name=${ESPOCRM_DATABASE_USER}&db-user-password=${ESPOCRM_DATABASE_PASSWORD}"
437+
runInstallationStep "setupConfirmation" "db-platform=${ESPOCRM_DATABASE_PLATFORM}&host-name=${databaseHost}&db-name=${ESPOCRM_DATABASE_NAME}&db-user-name=${ESPOCRM_DATABASE_USER}&db-user-password=${ESPOCRM_DATABASE_PASSWORD}"
432438
runInstallationStep "checkPermission"
433439
runInstallationStep "saveSettings" "site-url=${ESPOCRM_SITE_URL}&default-permissions-user=${DEFAULT_OWNER}&default-permissions-group=${DEFAULT_GROUP}"
434440
runInstallationStep "buildDatabase"
@@ -489,6 +495,7 @@ fi
489495
declare -A DEFAULTS=(
490496
['ESPOCRM_DATABASE_PLATFORM']='Mysql'
491497
['ESPOCRM_DATABASE_HOST']='mysql'
498+
['ESPOCRM_DATABASE_PORT']=''
492499
['ESPOCRM_DATABASE_NAME']='espocrm'
493500
['ESPOCRM_DATABASE_USER']='root'
494501
['ESPOCRM_DATABASE_PASSWORD']='password'

‎fpm/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,16 @@ RUN { \
9494
echo 'date.timezone=UTC'; \
9595
} > ${PHP_INI_DIR}/conf.d/espocrm.ini
9696

97-
ENV ESPOCRM_VERSION 8.2.4
98-
ENV ESPOCRM_SHA256 db911f9f58a93e72bc73ecb556aa1568944e68a6f69a32fde4d769be8ea45aa9
97+
ENV ESPOCRM_VERSION 8.2.5
98+
ENV ESPOCRM_SHA256 c48b57369d08805eb8b7b2180b5afd567fcf39b622a9239ceda70193fe29186c
9999

100100
WORKDIR /var/www/html
101101

102102
RUN set -ex; \
103-
curl -fSL "https://www.espocrm.com/downloads/EspoCRM-8.2.4.zip" -o EspoCRM.zip; \
103+
curl -fSL "https://www.espocrm.com/downloads/EspoCRM-8.2.5.zip" -o EspoCRM.zip; \
104104
echo "${ESPOCRM_SHA256} *EspoCRM.zip" | sha256sum -c -; \
105105
unzip -q EspoCRM.zip -d /usr/src; \
106-
mv "/usr/src/EspoCRM-8.2.4" /usr/src/espocrm; \
106+
mv "/usr/src/EspoCRM-8.2.5" /usr/src/espocrm; \
107107
rm EspoCRM.zip; \
108108
chown -R www-data:www-data /usr/src/espocrm
109109

‎fpm/docker-entrypoint.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,15 @@ installEspocrm() {
412412

413413
runInstallationStep "step1" "user-lang=${ESPOCRM_LANGUAGE}"
414414

415+
local databaseHost="${ESPOCRM_DATABASE_HOST}"
416+
417+
if [ -n "$ESPOCRM_DATABASE_PORT" ]; then
418+
databaseHost="${ESPOCRM_DATABASE_HOST}:${ESPOCRM_DATABASE_PORT}"
419+
fi
420+
415421
for i in {1..20}
416422
do
417-
settingsTestResult=$(runInstallationStep "settingsTest" "dbPlatform=${ESPOCRM_DATABASE_PLATFORM}&hostName=${ESPOCRM_DATABASE_HOST}&dbName=${ESPOCRM_DATABASE_NAME}&dbUserName=${ESPOCRM_DATABASE_USER}&dbUserPass=${ESPOCRM_DATABASE_PASSWORD}" true 2>&1)
423+
settingsTestResult=$(runInstallationStep "settingsTest" "dbPlatform=${ESPOCRM_DATABASE_PLATFORM}&hostName=${databaseHost}&dbName=${ESPOCRM_DATABASE_NAME}&dbUserName=${ESPOCRM_DATABASE_USER}&dbUserPass=${ESPOCRM_DATABASE_PASSWORD}" true 2>&1)
418424

419425
if [[ ! "$settingsTestResult" == *"Error:"* ]]; then
420426
break
@@ -428,7 +434,7 @@ installEspocrm() {
428434
return
429435
fi
430436

431-
runInstallationStep "setupConfirmation" "db-platform=${ESPOCRM_DATABASE_PLATFORM}&host-name=${ESPOCRM_DATABASE_HOST}&db-name=${ESPOCRM_DATABASE_NAME}&db-user-name=${ESPOCRM_DATABASE_USER}&db-user-password=${ESPOCRM_DATABASE_PASSWORD}"
437+
runInstallationStep "setupConfirmation" "db-platform=${ESPOCRM_DATABASE_PLATFORM}&host-name=${databaseHost}&db-name=${ESPOCRM_DATABASE_NAME}&db-user-name=${ESPOCRM_DATABASE_USER}&db-user-password=${ESPOCRM_DATABASE_PASSWORD}"
432438
runInstallationStep "checkPermission"
433439
runInstallationStep "saveSettings" "site-url=${ESPOCRM_SITE_URL}&default-permissions-user=${DEFAULT_OWNER}&default-permissions-group=${DEFAULT_GROUP}"
434440
runInstallationStep "buildDatabase"
@@ -489,6 +495,7 @@ fi
489495
declare -A DEFAULTS=(
490496
['ESPOCRM_DATABASE_PLATFORM']='Mysql'
491497
['ESPOCRM_DATABASE_HOST']='mysql'
498+
['ESPOCRM_DATABASE_PORT']=''
492499
['ESPOCRM_DATABASE_NAME']='espocrm'
493500
['ESPOCRM_DATABASE_USER']='root'
494501
['ESPOCRM_DATABASE_PASSWORD']='password'

0 commit comments

Comments
 (0)