diff --git a/5.1.0/loading.php b/5.1.0/loading.php index e935167c..760ad95e 100644 --- a/5.1.0/loading.php +++ b/5.1.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/5.1.0/vtiger-foreground.sh b/5.1.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/5.1.0/vtiger-foreground.sh +++ b/5.1.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/5.2.0-RC/loading.php b/5.2.0-RC/loading.php index e935167c..760ad95e 100644 --- a/5.2.0-RC/loading.php +++ b/5.2.0-RC/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/5.2.0-RC/vtiger-foreground.sh b/5.2.0-RC/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/5.2.0-RC/vtiger-foreground.sh +++ b/5.2.0-RC/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/5.2.0-VB1/loading.php b/5.2.0-VB1/loading.php index e935167c..760ad95e 100644 --- a/5.2.0-VB1/loading.php +++ b/5.2.0-VB1/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/5.2.0-VB1/vtiger-foreground.sh b/5.2.0-VB1/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/5.2.0-VB1/vtiger-foreground.sh +++ b/5.2.0-VB1/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/5.2.0-VB2/loading.php b/5.2.0-VB2/loading.php index e935167c..760ad95e 100644 --- a/5.2.0-VB2/loading.php +++ b/5.2.0-VB2/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/5.2.0-VB2/vtiger-foreground.sh b/5.2.0-VB2/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/5.2.0-VB2/vtiger-foreground.sh +++ b/5.2.0-VB2/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/5.2.0/loading.php b/5.2.0/loading.php index e935167c..760ad95e 100644 --- a/5.2.0/loading.php +++ b/5.2.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/5.2.0/vtiger-foreground.sh b/5.2.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/5.2.0/vtiger-foreground.sh +++ b/5.2.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/5.2.1/loading.php b/5.2.1/loading.php index e935167c..760ad95e 100644 --- a/5.2.1/loading.php +++ b/5.2.1/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/5.2.1/vtiger-foreground.sh b/5.2.1/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/5.2.1/vtiger-foreground.sh +++ b/5.2.1/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/5.3.0-RC/loading.php b/5.3.0-RC/loading.php index e935167c..760ad95e 100644 --- a/5.3.0-RC/loading.php +++ b/5.3.0-RC/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/5.3.0-RC/vtiger-foreground.sh b/5.3.0-RC/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/5.3.0-RC/vtiger-foreground.sh +++ b/5.3.0-RC/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/5.3.0/loading.php b/5.3.0/loading.php index e935167c..760ad95e 100644 --- a/5.3.0/loading.php +++ b/5.3.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/5.3.0/vtiger-foreground.sh b/5.3.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/5.3.0/vtiger-foreground.sh +++ b/5.3.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/5.4.0-RC/loading.php b/5.4.0-RC/loading.php index e935167c..760ad95e 100644 --- a/5.4.0-RC/loading.php +++ b/5.4.0-RC/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/5.4.0-RC/vtiger-foreground.sh b/5.4.0-RC/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/5.4.0-RC/vtiger-foreground.sh +++ b/5.4.0-RC/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/5.4.0/loading.php b/5.4.0/loading.php index e935167c..760ad95e 100644 --- a/5.4.0/loading.php +++ b/5.4.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/5.4.0/vtiger-foreground.sh b/5.4.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/5.4.0/vtiger-foreground.sh +++ b/5.4.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/6.0.0-Beta/loading.php b/6.0.0-Beta/loading.php index e935167c..760ad95e 100644 --- a/6.0.0-Beta/loading.php +++ b/6.0.0-Beta/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/6.0.0-Beta/vtiger-foreground.sh b/6.0.0-Beta/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/6.0.0-Beta/vtiger-foreground.sh +++ b/6.0.0-Beta/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/6.0.0-RC/loading.php b/6.0.0-RC/loading.php index e935167c..760ad95e 100644 --- a/6.0.0-RC/loading.php +++ b/6.0.0-RC/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/6.0.0-RC/vtiger-foreground.sh b/6.0.0-RC/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/6.0.0-RC/vtiger-foreground.sh +++ b/6.0.0-RC/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/6.0.0/loading.php b/6.0.0/loading.php index e935167c..760ad95e 100644 --- a/6.0.0/loading.php +++ b/6.0.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/6.0.0/vtiger-foreground.sh b/6.0.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/6.0.0/vtiger-foreground.sh +++ b/6.0.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/6.1.0-Beta/Dockerfile b/6.1.0-Beta/Dockerfile index da653f82..75267b6f 100644 --- a/6.1.0-Beta/Dockerfile +++ b/6.1.0-Beta/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && \ curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ php composer clearcache && rm composer && \ curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \ usermod -u 1000 www-data && groupmod -g 1000 www-data && \ diff --git a/6.1.0-Beta/loading.php b/6.1.0-Beta/loading.php index e935167c..760ad95e 100644 --- a/6.1.0-Beta/loading.php +++ b/6.1.0-Beta/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/6.1.0-Beta/vtiger-foreground.sh b/6.1.0-Beta/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/6.1.0-Beta/vtiger-foreground.sh +++ b/6.1.0-Beta/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/6.1.0/Dockerfile b/6.1.0/Dockerfile index 3cd6f570..47760754 100644 --- a/6.1.0/Dockerfile +++ b/6.1.0/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && \ curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ php composer clearcache && rm composer && \ curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \ usermod -u 1000 www-data && groupmod -g 1000 www-data && \ diff --git a/6.1.0/loading.php b/6.1.0/loading.php index e935167c..760ad95e 100644 --- a/6.1.0/loading.php +++ b/6.1.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/6.1.0/vtiger-foreground.sh b/6.1.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/6.1.0/vtiger-foreground.sh +++ b/6.1.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/6.2.0/Dockerfile b/6.2.0/Dockerfile index 8111d7e8..a3947b08 100644 --- a/6.2.0/Dockerfile +++ b/6.2.0/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && \ curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ php composer clearcache && rm composer && \ curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \ usermod -u 1000 www-data && groupmod -g 1000 www-data && \ diff --git a/6.2.0/loading.php b/6.2.0/loading.php index e935167c..760ad95e 100644 --- a/6.2.0/loading.php +++ b/6.2.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/6.2.0/vtiger-foreground.sh b/6.2.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/6.2.0/vtiger-foreground.sh +++ b/6.2.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/6.3.0/Dockerfile b/6.3.0/Dockerfile index c4e788e2..52c15972 100644 --- a/6.3.0/Dockerfile +++ b/6.3.0/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && \ curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ php composer clearcache && rm composer && \ curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \ usermod -u 1000 www-data && groupmod -g 1000 www-data && \ diff --git a/6.3.0/loading.php b/6.3.0/loading.php index e935167c..760ad95e 100644 --- a/6.3.0/loading.php +++ b/6.3.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/6.3.0/vtiger-foreground.sh b/6.3.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/6.3.0/vtiger-foreground.sh +++ b/6.3.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/6.4.0/Dockerfile b/6.4.0/Dockerfile index a88eb6f0..ddf4e85b 100644 --- a/6.4.0/Dockerfile +++ b/6.4.0/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && \ curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ php composer clearcache && rm composer && \ curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \ usermod -u 1000 www-data && groupmod -g 1000 www-data && \ diff --git a/6.4.0/loading.php b/6.4.0/loading.php index e935167c..760ad95e 100644 --- a/6.4.0/loading.php +++ b/6.4.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/6.4.0/vtiger-foreground.sh b/6.4.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/6.4.0/vtiger-foreground.sh +++ b/6.4.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/6.5.0/Dockerfile b/6.5.0/Dockerfile index 90038cb2..ac69e453 100644 --- a/6.5.0/Dockerfile +++ b/6.5.0/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && \ curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ php composer clearcache && rm composer && \ curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \ usermod -u 1000 www-data && groupmod -g 1000 www-data && \ diff --git a/6.5.0/loading.php b/6.5.0/loading.php index e935167c..760ad95e 100644 --- a/6.5.0/loading.php +++ b/6.5.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/6.5.0/vtiger-foreground.sh b/6.5.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/6.5.0/vtiger-foreground.sh +++ b/6.5.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/7.0.0/Dockerfile b/7.0.0/Dockerfile index fec06748..f831fd78 100644 --- a/7.0.0/Dockerfile +++ b/7.0.0/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && \ curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ php composer clearcache && rm composer && \ curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \ usermod -u 1000 www-data && groupmod -g 1000 www-data && \ diff --git a/7.0.0/loading.php b/7.0.0/loading.php index e935167c..760ad95e 100644 --- a/7.0.0/loading.php +++ b/7.0.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/7.0.0/vtiger-foreground.sh b/7.0.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/7.0.0/vtiger-foreground.sh +++ b/7.0.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/7.0.1/Dockerfile b/7.0.1/Dockerfile index 24e0d96b..d2031643 100644 --- a/7.0.1/Dockerfile +++ b/7.0.1/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && \ curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ php composer clearcache && rm composer && \ curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \ usermod -u 1000 www-data && groupmod -g 1000 www-data && \ diff --git a/7.0.1/loading.php b/7.0.1/loading.php index e935167c..760ad95e 100644 --- a/7.0.1/loading.php +++ b/7.0.1/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/7.0.1/vtiger-foreground.sh b/7.0.1/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/7.0.1/vtiger-foreground.sh +++ b/7.0.1/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/7.1.0-RC/Dockerfile b/7.1.0-RC/Dockerfile index 233dd243..cdd4782c 100644 --- a/7.1.0-RC/Dockerfile +++ b/7.1.0-RC/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && \ curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ php composer clearcache && rm composer && \ curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \ usermod -u 1000 www-data && groupmod -g 1000 www-data && \ diff --git a/7.1.0-RC/loading.php b/7.1.0-RC/loading.php index e935167c..760ad95e 100644 --- a/7.1.0-RC/loading.php +++ b/7.1.0-RC/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/7.1.0-RC/vtiger-foreground.sh b/7.1.0-RC/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/7.1.0-RC/vtiger-foreground.sh +++ b/7.1.0-RC/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/7.1.0/Dockerfile b/7.1.0/Dockerfile index e08b5491..2a44cc3d 100644 --- a/7.1.0/Dockerfile +++ b/7.1.0/Dockerfile @@ -1,6 +1,7 @@ FROM php:7.0.33-apache LABEL maintainer="Francesco Bianco " +ENV LAYER_BREAK=true ENV VT_VERSION="7.1.0" \ DATABASE_PACKAGE="mariadb-server-10.1" \ PATH="/root/.composer/vendor/bin:$PATH" @@ -15,15 +16,15 @@ RUN apt-get update && \ docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ - echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && \ - curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ - php composer clearcache && rm composer && \ - curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \ - usermod -u 1000 www-data && groupmod -g 1000 www-data && \ + echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && ${LAYER_BREAK} +RUN curl -o composer -sL https://getcomposer.org/composer.phar && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ + php composer clearcache && rm composer && ${LAYER_BREAK} +RUN curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && ${LAYER_BREAK} +RUN usermod -u 1000 www-data && groupmod -g 1000 www-data && \ echo "ServerName localhost" >> /etc/apache2/apache2.conf && \ - a2enmod ssl && a2enmod rewrite && \ - cd /usr/src/vtiger && \ + a2enmod ssl && a2enmod rewrite && ${LAYER_BREAK} +RUN cd /usr/src/vtiger && \ curl -o vtiger.tar.gz -L "https://github.com/javanile/vtiger-core/archive/7.1.0.tar.gz" && \ tar -xzf vtiger.tar.gz && \ rm vtiger.tar.gz && \ @@ -31,14 +32,14 @@ RUN apt-get update && \ mv "vtiger-core-7.1.0" /var/www/html && \ vtiger permissions --fix && \ mv .symvol /var/www/html && \ - mkdir -p volume /var/lib/vtiger && \ - apt-get clean && rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* + mkdir -p volume /var/lib/vtiger && ${LAYER_BREAK} +RUN apt-get clean && rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* COPY vtiger-*.sh /usr/local/bin/ COPY vtiger-*.php /usr/src/vtiger/ -RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && \ - cd /var/www/html/vtlib/Vtiger/ && \ +RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && ${LAYER_BREAK} +RUN cd /var/www/html/vtlib/Vtiger/ && \ sed -e 's!realpath(!__realpath__(!' -ri Utils.php Deprecated.php && \ symvol move /var/www/html /usr/src/vtiger/volume diff --git a/7.1.0/loading.php b/7.1.0/loading.php index e935167c..760ad95e 100644 --- a/7.1.0/loading.php +++ b/7.1.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/7.1.0/vtiger-foreground.sh b/7.1.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/7.1.0/vtiger-foreground.sh +++ b/7.1.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/7.2.0/Dockerfile b/7.2.0/Dockerfile index e14c38c3..136ac47e 100644 --- a/7.2.0/Dockerfile +++ b/7.2.0/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && \ curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ php composer clearcache && rm composer && \ curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \ usermod -u 1000 www-data && groupmod -g 1000 www-data && \ diff --git a/7.2.0/loading.php b/7.2.0/loading.php index e935167c..760ad95e 100644 --- a/7.2.0/loading.php +++ b/7.2.0/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/7.2.0/vtiger-foreground.sh b/7.2.0/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/7.2.0/vtiger-foreground.sh +++ b/7.2.0/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/Dockerfile.main.template b/Dockerfile.main.template index dba4ca92..27581e85 100644 --- a/Dockerfile.main.template +++ b/Dockerfile.main.template @@ -18,7 +18,7 @@ RUN apt-get update && \ docker-php-ext-install imap exif mysqli pdo pdo_mysql zip gd xml && \ echo "cron.* /var/log/cron.log" >> /etc/rsyslog.conf && rm -fr /etc/cron.* && mkdir /etc/cron.d && ${LAYER_BREAK} RUN curl -o composer -sL https://getcomposer.org/composer.phar && \ - php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.14 javanile/vtiger-cli:0.0.4 && \ + php composer global require javanile/http-robot:0.0.2 javanile/mysql-import:0.0.15 javanile/vtiger-cli:0.0.4 && \ php composer clearcache && rm composer && ${LAYER_BREAK} RUN curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && ${LAYER_BREAK} RUN usermod -u 1000 www-data && groupmod -g 1000 www-data && \ diff --git a/loading.php b/loading.php index e935167c..760ad95e 100644 --- a/loading.php +++ b/loading.php @@ -3,24 +3,27 @@ vtiger | loading... - - + + -
-vtiger -

- loading... - %%MESSAGE%% -

-
- +
+ vtiger +

+ loading... + %%MESSAGE%% +

+
+
+ Javanile +
+ diff --git a/vtiger-foreground.sh b/vtiger-foreground.sh index 74d57798..54ceb223 100755 --- a/vtiger-foreground.sh +++ b/vtiger-foreground.sh @@ -57,6 +57,11 @@ service apache2 stop >/dev/null 2>&1 echo "[vtiger] Set working directory: ${WORKDIR}" cd ${WORKDIR} +## Apply database patches if exists +loading "Waiting for patch database..." +[[ -f vtiger.sql ]] && echo -n "[vtiger] Database patch: " && mysql-import --force vtiger.sql +[[ -f vtiger.override.sql ]] && echo -n "[vtiger] Database override: " && mysql-import --force vtiger.override.sql + ## copy vtiger.json file on working directory [[ ! -f vtiger.json ]] && cp /usr/src/vtiger/vtiger.json . diff --git a/vtiger.override.sql b/vtiger.override.sql new file mode 100644 index 00000000..507c233e --- /dev/null +++ b/vtiger.override.sql @@ -0,0 +1,2 @@ + +UPDATE vtiger_users SET first_name='Ciccio' WHERE user_name='admin' diff --git a/vtiger.sql b/vtiger.sql new file mode 100644 index 00000000..e69de29b