lsphp80, fix sql

.env

@@ -1,6 +1,6 @@
 TimeZone=America/New_York
-OLS_VERSION=1.6.20
+OLS_VERSION=1.7.11
-PHP_VERSION=lsphp74
+PHP_VERSION=lsphp80
 MYSQL_DATABASE=wordpress
 MYSQL_ROOT_PASSWORD=password
 MYSQL_USER=wordpress

README.md

@@ -31,7 +31,7 @@ The docker image installs the following packages on your system:
 
 |Component|Version|
 | :-------------: | :-------------: |
-|Linux|Ubuntu 18.04|
+|Linux|Ubuntu 20.04|
 |OpenLiteSpeed|[Latest version](https://openlitespeed.org/downloads/)|
 |MariaDB|[Stable version: 10.5](https://hub.docker.com/_/mariadb)|
 |PHP|[Latest version](http://rpms.litespeedtech.com/debian/)|
@@ -162,12 +162,12 @@ bash bin/webadmin.sh [-M, --mod-secure] disable
 After installation, you can use phpMyAdmin to access the database by visiting `http://127.0.0.1:8080` or `https://127.0.0.1:8443`. The default username is `root`, and the password is the same as the one you supplied in the `.env` file.
 
 ## Customization
-If you want to customize the image by adding some packages, e.g. `lsphp74-pspell`, just extend it with a Dockerfile. 
+If you want to customize the image by adding some packages, e.g. `lsphp80-pspell`, just extend it with a Dockerfile. 
 1. We can create a `custom` folder and a `custom/Dockerfile` file under the main project. 
 2. Add the following example code to `Dockerfile` under the custom folder
 ```
 FROM litespeedtech/openlitespeed:latest
-RUN apt-get update && apt-get install lsphp74-pspell -y
+RUN apt-get update && apt-get install lsphp80-pspell -y
 ```
 3. Add `build: ./custom` line under the "image: litespeedtech" of docker-composefile. So it will looks like this 
 ```

bin/container/appinstallctl.sh

@@ -95,7 +95,7 @@ set_vh_docroot(){
 check_sql_native(){
 	local COUNTER=0
 	local LIMIT_NUM=100
-	until [ "$(curl -v mysql:3306 2>&1 | grep native)" ]; do
+	until [ "$(curl -v mysql:3306 2>&1 | grep -i 'native\|Connected')" ]; do
 		echo "Counter: ${COUNTER}/${LIMIT_NUM}"
 		COUNTER=$((COUNTER+1))
 		if [ ${COUNTER} = 10 ]; then