Merge branch 'develop'

Author: gegere

README.md

@@ -4,7 +4,7 @@
 [![Circle CI](https://circleci.com/gh/htmlgraphic/Apache/tree/master.svg?style=svg)](https://circleci.com/gh/htmlgraphic/Apache/tree/master) 
 [![](https://images.microbadger.com/badges/image/htmlgraphic/apache:latest.svg)](https://microbadger.com/images/htmlgraphic/apache:latest "Get your own image badge on microbadger.com")
 
-This repo will give you a turn key Docker container build for use in **production** OR **dev**. The setup includes an Apache/2.4.29 web service, PHP Version 7.4.3, PHP Composer, linked [MySQL 5.7.29](https://hub.docker.com/_/mysql) instance and a data container volume.
+This repo will give you a turn key Docker container build for use in **production** OR **dev**. The setup includes an Apache/2.4.29 web service, PHP Version 7.4+, PHP Composer, linked [MySQL 5.7.29](https://hub.docker.com/_/mysql) instance and a data container volume.
 
 Using containers offer a huge advantage when developing locally or in prodcution. Use this containers for development and deployment. Changing `NODE_ENVIRONMENT` within to `.env` to `dev` or `production` will offer a dynamic environment.
 
@@ -55,8 +55,35 @@ The **Apache** container the directory `/data` is shared to your local system vi
 Docker Compose File Reference [more info](https://docs.docker.com/compose/compose-file/) 
 
 
+### Mac OS X / Linux
+
+>	Type `make` for more build options:
+
+```bash
+> git clone https://github.com/htmlgraphic/Apache.git ~/Docker/Apache && cd ~/Docker/Apache
+> cp .env.example .env
+> make run 
+```
+
+### Windows
+
+```bash
+> git clone https://github.com/htmlgraphic/Apache.git ~/Docker/Apache; cd ~/Docker/Apache
+> copy .env.example .env
+> docker-compose -f docker-compose.local.yml up -d
+```
+
+>	Optional, are you having problems on Windows? Disable Firewall
+
+```bash
+> netsh advfirewall show currentprofile
+> netsh advfirewall set allprofiles state off
+```
+
+
 ---
 
+
 ### Google Cloud
 
 Use the following command with Google Compute. This will create a [virtual machine instance](https://cloud.google.com/sdk/gcloud/reference/beta/compute/instances/create-with-container) running [COS](https://cloud.google.com/container-optimized-os/) (Container Operating System).
@@ -89,7 +116,7 @@ docker run --rm --name temp_certbot \
 	-w /data/www/XYZ/public_html -d example.com -d www.example.com
 ```
 
-When host system is restarted, start Docker instance on boot:
+Set the following cron task, when host system is restarted, start instance will start on boot:
 ```bash
 sudo su
 crontab -e
@@ -99,36 +126,6 @@ crontab -e
 
 ---
 
-### Mac OS X / Linux
-
->	Type `make` for more build options:
-
-```bash
-> git clone https://github.com/htmlgraphic/Apache.git ~/Docker/Apache && cd ~/Docker/Apache
-> cp .env.example .env
-> make run 
-```
-
-### Windows
-
-```bash
-> git clone https://github.com/htmlgraphic/Apache.git ~/Docker/Apache; cd ~/Docker/Apache
-> copy .env.example .env
-> docker-compose -f docker-compose.local.yml up -d
-```
-
->	Optional, are you having problems on Windows? Disable Firewall
-
-```bash
-> netsh advfirewall show currentprofile
-> netsh advfirewall set allprofiles state off
-```
-
-
-#### 
-
-
-
 
 ## phpMyAdmin
 

app/run.sh

@@ -154,15 +154,17 @@ cat <<EOT >> /etc/apache2/mods-available/pagespeed.conf
     Order allow,deny
     Allow from localhost
     Allow from 127.0.0.1
-    Allow from all
+    Allow from 35.232.187.229
+    Allow from 65.31.226.148
     SetHandler pagespeed_admin
 </Location>
 
 <Location /pagespeed_global_admin>
     Order allow,deny
     Allow from localhost
     Allow from 127.0.0.1
-    Allow from all
+    Allow from 35.232.187.229
+    Allow from 65.31.226.148
     SetHandler pagespeed_global_admin
 </Location>
 EOT