review #14

.env

@@ -1,2 +1,3 @@
-version=7.1.0-php8.0
+version=7.1.0-php7.4
+database=mysql:8.0.29
 install=1

5.1.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

5.2.0-RC/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

5.2.0-VB1/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

5.2.0-VB2/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

5.2.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

5.2.1/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

5.3.0-RC/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

5.3.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

5.4.0-RC/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

5.4.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

6.0.0-Beta/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

6.0.0-RC/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

6.0.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

6.1.0-Beta/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

6.1.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

6.2.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

6.3.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

6.4.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

6.5.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

7.0.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

7.0.1/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

7.1.0-RC/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

7.1.0-php7.4/Dockerfile

@@ -1,6 +1,7 @@
 FROM php:7.4.29-apache
 LABEL maintainer="Francesco Bianco <info@javanile.org>"
 
+ENV LAYER_BREAK=true
 ENV VT_VERSION="7.1.0-php7.4" \
     DATABASE_PACKAGE="mariadb-server-10.5" \
     COMPOSER_HOME=/usr/src/vtiger \
@@ -13,35 +14,35 @@ COPY 000-default.conf /etc/apache2/sites-available/
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y libzip-dev zlib1g-dev libc-client-dev libkrb5-dev libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxml2-dev cron rsyslog zip unzip socat vim nano && \
-    docker-php-ext-configure gd && \
-    docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+    docker-php-ext-configure gd && ${LAYER_BREAK}
+RUN 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 && \
+    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 && \
-    curl -sL https://javanile.github.io/symvol/setup.sh?v=0.0.2 | bash - && \
-    usermod -u 1000 www-data && groupmod -g 1000 www-data && \
+    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 && \
     rm -fr /var/www/html && \
     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 develop-install.sh /usr/local/bin/
 RUN develop-install.sh
 COPY health.php polyfill.php /var/www/html/
 COPY vtiger-*.sh /usr/local/bin/
 COPY vtiger-*.php /usr/src/vtiger/
 
-RUN vtiger-install.sh --assert-mysql --fix-php --dump --remove-mysql
+RUN vtiger-install.sh --assert-mysql --dump --remove-mysql
 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

7.1.0-php7.4/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

7.1.0-php8.0/Dockerfile

@@ -1,7 +1,6 @@
 FROM php:8.0.19-apache
 LABEL maintainer="Francesco Bianco <info@javanile.org>"
 
-ENV LAYER_BREAK=true
 ENV VT_VERSION="7.1.0-php8.0" \
     DATABASE_PACKAGE="mariadb-server-10.5" \
     COMPOSER_HOME=/usr/src/vtiger \
@@ -14,35 +13,35 @@ COPY 000-default.conf /etc/apache2/sites-available/
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y libzip-dev zlib1g-dev libc-client-dev libkrb5-dev libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxml2-dev cron rsyslog zip unzip socat vim nano && \
-    docker-php-ext-configure gd && ${LAYER_BREAK}
-RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+    docker-php-ext-configure gd && \
+    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 && ${LAYER_BREAK}
-RUN curl -o composer -sL https://getcomposer.org/composer.phar && \
+    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.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 && \
+    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 "ServerName localhost" >> /etc/apache2/apache2.conf && \
-    a2enmod ssl && a2enmod rewrite && ${LAYER_BREAK}
-RUN cd /usr/src/vtiger && \
+    a2enmod ssl && a2enmod rewrite && \
+    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 && \
     rm -fr /var/www/html && \
     mv "vtiger-core-7.1.0" /var/www/html && \
     vtiger permissions --fix && \
     mv .symvol /var/www/html && \
-    mkdir -p volume /var/lib/vtiger && ${LAYER_BREAK}
-RUN apt-get clean && rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
+    mkdir -p volume /var/lib/vtiger && \
+    apt-get clean && rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
 
 COPY develop-install.sh /usr/local/bin/
 RUN develop-install.sh
 COPY health.php polyfill.php /var/www/html/
 COPY vtiger-*.sh /usr/local/bin/
 COPY vtiger-*.php /usr/src/vtiger/
 
-RUN vtiger-install.sh --assert-mysql --fix-php --dump --remove-mysql
+RUN vtiger-install.sh --assert-mysql --dump --remove-mysql
 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

7.1.0-php8.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

7.1.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

7.2.0/vtiger-install.php

@@ -166,7 +166,7 @@
         echo " -> [ERROR] install error on first login.\n";
         #echo $values['@text'];
         echo file_get_contents('/var/www/html/logs/php.log');
-        exit(1);
+        #exit(1);
     }
 }
 echo " -> form-token: '{$values['__vtrftk']}' auth-key: '{$values['auth_key']}'\n";

Dockerfile.next.template

@@ -48,7 +48,7 @@ COPY vtiger-*.php /usr/src/vtiger/
 ## @endblock
 
 ## @block: develop
-RUN vtiger-install.sh --assert-mysql --fix-php --dump --remove-mysql
+RUN vtiger-install.sh --assert-mysql --dump --remove-mysql
 #COPY vtiger-foreground.sh /usr/local/bin/
 #COPY vtiger-functions.php /usr/src/vtiger/
 ## @block: release

Makefile

@@ -7,6 +7,11 @@ start: build
 	@echo "Start vtiger ${version}..."
 	@docker-compose up --build --force-recreate vtiger
 
+restart: build
+	@echo "Restart vtiger ${version}..."
+	@docker-compose down -v
+	@docker-compose up --build --force-recreate vtiger
+
 bash:
 	@docker-compose exec vtiger bash
 

docker-compose.yml

@@ -30,7 +30,7 @@ services:
       - mysql
 
   mysql:
-    image: mysql:5.5
+    image: ${database}
     environment:
       - MYSQL_ROOT_PASSWORD=secret
     volumes: