diff --git a/Dockerfile b/Dockerfile index 27295b1786..62a1e4fcbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ php7.0-gd \ php7.0-xml \ php7.0-mbstring \ php7.0-zip \ +php7.0-bcmath \ patch \ curl \ vim \ @@ -23,6 +24,7 @@ mysql-client \ RUN phpenmod mcrypt RUN phpenmod gd +RUN phpenmod bcmath RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/apache2/php.ini RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/cli/php.ini diff --git a/snipeit.sh b/snipeit.sh index 87a3074fe9..662e6bcf5c 100755 --- a/snipeit.sh +++ b/snipeit.sh @@ -151,7 +151,7 @@ case $distro in echo " The installer has detected Debian version $version as the OS." distro=debian ;; - *centos*|*redhat*|*ol*) + *centos*|*redhat*|*ol*|*rhel*) echo " The installer has detected $distro version $version as the OS." distro=centos ;; @@ -292,7 +292,7 @@ case $distro in service apache2 restart ;; centos ) - if [ "$version" == "6" ]; then + if [[ "$version" =~ ^6 ]]; then ##################################### Install for Centos/Redhat 6 ############################################## webdir=/var/www/html @@ -409,7 +409,7 @@ case $distro in service httpd restart - elif [ "$version" == "7" ]; then + elif [[ "$version" =~ ^7 ]]; then ##################################### Install for Centos/Redhat 7 ############################################## webdir=/var/www/html