Run update.sh

php-zendserver/README.md

@@ -17,7 +17,7 @@ Zend Server is the integrated application platform for PHP mobile and web apps.
 
 ### Boost your Development with Z-Ray
 
-Using Zend Server Z-Ray is akin to wearing X-Ray goggles, effortlessly giving developers deep insight into how their code is running as they are developing it—all without having to change any of their habits or workflow. With Z-Ray, developers can immediately understand the impact of their code changes, enabling them to both improve quality and solve issues long before their code reaches production. In addition to the obvious benefits of this ‘Left Shifting’—better performance, fewer production issues and faster recovery times—using Z-Ray is also downright fun!
+Using Zend Server Z-Ray is akin to wearing X-Ray goggles, effortlessly giving developers deep insight into how their code is running as they are developing it – all without having to change any of their habits or workflow. With Z-Ray, developers can immediately understand the impact of their code changes, enabling them to both improve quality and solve issues long before their code reaches production. In addition to the obvious benefits of this ‘Left Shifting’ – better performance, fewer production issues and faster recovery times – using Z-Ray is also downright fun!
 
 ### Powering Continuous Delivery
 
@@ -25,66 +25,93 @@ Zend Server is the platform that enables Continuous Delivery, which provides con
 
 ### Additional Resources
 
--	http://www.zend.com/
+-	[http://www.zend.com/](http://www.zend.com/)
--	http://kb.zend.com/
+-	[http://kb.zend.com/](http://kb.zend.com/)
--	http://files.zend.com/help/Zend-Server/zend-server.htm#faqs.htm
+-	[http://files.zend.com/help/Zend-Server/zend-server.htm#faqs.htm](http://files.zend.com/help/Zend-Server/zend-server.htm#faqs.htm)
--	http://files.zend.com/help/Zend-Server/zend-server.htm#getting_started.htm
+-	[http://files.zend.com/help/Zend-Server/zend-server.htm#getting\_started.htm](http://files.zend.com/help/Zend-Server/zend-server.htm#getting_started.htm)
 
 # PHP-ZendServer
 
-This is a cluster-enabled version of a Dockerized Zend Server 7.0 container. With Zend Server on Docker, you'll get your PHP applications up and running on a highly available PHP production environment which includes, amongst other features, a highly reliable PHP stack, application monitoring, troubleshooting, and the new and innovative new technology—Z-Ray. Z-Ray gives developers unprecedented visibility into their code by tracking and displaying in a toolbar live and detailed info on how the various elements constructing their page are performing.
+This is a cluster-enabled version of a Dockerized Zend Server 8.0 container. With Zend Server on Docker, you'll get your PHP applications up and running on a highly available PHP production environment which includes, amongst other features, a highly reliable PHP stack, application monitoring, troubleshooting, and the new and innovative new technology - Z-Ray. Z-Ray gives developers unprecedented visibility into their code by tracking and displaying in a toolbar live and detailed info on how the various elements constructing their page are performing.
+
+For development purposes we provide you with a trial license that is valid until 31/07/2016. For production use you must provide a valid Zend Server license using the instructions below in the Usage section.
 
 ## Usage
 
 #### Launching the Container from Docker-Hub
 
-Zend Server is shared on [Docker-Hub](https://registry.hub.docker.com/_/php-zendserver/) as **php-zendserver**.
+Zend Server is shared on [Docker-Hub] as **php-zendserver**.
 
--	To start a single Zend Server instance, execute:
+##### Single instance
 
-		$ docker run php-zendserver
+To start a single Zend Server instance, execute:
 
--	You can specify the PHP and Zend Server version by adding ':<php-version>' or ':&lt;ZS-version&gt;-php&lt;version&gt;' to the 'docker run' command. Availible PHP version are 5.4 & 5.5 (5.5 is the default) and Zend Server 7 (for example: php-zendserver:7.0-php5.4).
+	    $ docker run php-zendserver
 
--	To start a Zend Server cluster, execute the following command for each cluster node:
+-	You can specify the PHP and Zend Server version by adding ':<php-version>' or ':&lt;ZS-version&gt;-php&lt;version&gt;' to the 'docker run' command.
 
-	```console
+		for example: 
-	$ docker run -e MYSQL_HOSTNAME=<db-ip> -e MYSQL_PORT=3306 -e MYSQL_USERNAME=<username> -e MYSQL_PASSWORD=<password> -e MYSQL_DBNAME=zend php-zendserver
+		$docker run php-zendserver:8.0-php5.6
-	```
+
+#### Availible versions:
+
+-	5.5
+-	5.6 (5.6 is the default)
+-	Zend Server 7
+-	Zend Server 8
+-	Zend Server 9 Preview Release (With PHP 7 GA)
+
+##### Cluster
+
+To start a Zend Server cluster, execute the following command for each cluster node:
+
+	    $ docker run -e MYSQL_HOSTNAME=<db-ip> -e MYSQL_PORT=3306 -e MYSQL_USERNAME=<username> -e MYSQL_PASSWORD=<password> -e MYSQL_DBNAME=zend php-zendserver
+
+#### Bring your own license
+
+To use your own Zend Server license: $ docker run php-zendserver -e ZEND_LICENSE_KEY=<license-key> -e ZEND_LICENSE_ORDER=<order-number>
 
 #### Launching the Container from Dockerfile
 
--	From a local folder containing this repo's clone, execute the following command to generate the image. The **image-id** will be outputted:
+From a local folder containing this repo's clone, execute the following command to generate the image. The **image-id** will be outputted:
 
-	```console
+	    $ docker build .
-	$ docker build .
-	```
 
--	To start a single Zend Server instance, execute:
+##### Single instance from custom image
 
-	```console
+To start a single Zend Server instance, execute:
-	$ docker run <image-id>
-	```
 
--	To start a Zend Server cluster, execute the following command on each cluster node:
+	    $ docker run <image-id>
 
-	```console
+#### Cluster from custom image
-	$ docker run -e MYSQL_HOSTNAME=<db-ip> -e MYSQL_PORT=3306 -e MYSQL_USERNAME=<username> -e MYSQL_PASSWORD=<password> -e MYSQL_DBNAME=zend <image-id>
+
-	```
+To start a Zend Server cluster, execute the following command on each cluster node:
+
+	    $ docker run -e MYSQL_HOSTNAME=<db-ip> -e MYSQL_PORT=3306 -e MYSQL_USERNAME=<username> -e MYSQL_PASSWORD=<password> -e MYSQL_DBNAME=zend <image-id>
 
 #### Accessing Zend server
 
 Once started, the container will output the information required to access the PHP application and the Zend Server UI, including an automatically generated admin password.
 
+#### Port forwarding (For remote access)
+
 To access the container **remotely**, port forwarding must be configured, either manually or using docker. For example, this command redirects port 80 to port 88, and port 10081 (Zend Server UI port) to port 10088:
 
 	    $ docker run -p 88:80 -p 10088:10081 php-zendserver
 
-For clustered instances:
+##### For clustered instances:
+
+To start a Zend Server cluster you must provide a Mysql compatible database:
 
 	    $ docker run -p 88:80 -p 10088:10081 -e MYSQL_HOSTNAME=<db-ip> -e MYSQL_PORT=3306 -e MYSQL_USERNAME=<username> -e MYSQL_PASSWORD=<password> -e MYSQL_DBNAME=zend <image-id>
 
-Please note, that when running multiple instances only one instance can be bound to a port. If you are running a cluster, either assign a port redirect to one node only, or assign a different port to each container.
+Please note, when running multiple instances only one instance can be bound to a port. If you are running a cluster, either assign a port redirect to one node only, or assign a different port to each container.
+
+#### Adding application files
+
+Application files can be automatically pulled from a Git repo by setting the **GIT_URL** env var to the repo's URL. Alternatively, if building an image from Dockerfile, place the app files in the "app/" folder.
+
+The files will be copied to the containers /var/www/html folder and defined in Zend Server as the default app. An example index.html file is included. this feature is available in Zend Server 8 and above.
 
 #### Env variables
 
@@ -94,24 +121,32 @@ Env variables are passed in the run command with the "-e" switch.
 
 To specify a pre-defined admin password for Zend Server use:
 
--	ZS_ADMIN_PASSWORD
+-	ZS\_ADMIN\_PASSWORD
+
+Automatically Deploy an app from Git URL:
+
+-	GIT\_URL
 
 MySQL vars for clustered ops. *ALL* are required for the node to properly join a cluster:
 
--	MYSQL_HOSTNAME - ip or hostname of MySQL database
+-	MYSQL\_HOSTNAME - ip or hostname of MySQL database
--	MYSQL_PORT - MySQL listening port
+-	MYSQL\_PORT - MySQL listening port
--	MYSQL_USERNAME
+-	MYSQL\_USERNAME
--	MYSQL_PASSWORD
+-	MYSQL\_PASSWORD
--	MYSQL_DBNAME - Name of the database Zend Server will use for cluster ops (created automatically if it does not exist).
+-	MYSQL\_DBNAME - Name of the database Zend Server will use for cluster ops (created automatically if it does not exist).
 
 To specify a pre-purchased license use the following env vars:
 
--	ZEND_LICENSE_KEY
+-	ZEND\_LICENSE\_KEY
--	ZEND_LICENSE_ORDER
+-	ZEND\_LICENSE\_ORDER
+
+Set Zend Server to production mode by setting the following env var to "true". By default Zend Server is set to "development mode" with Z-Ray enabled:
+
+-	ZS\_PRODUCTION
 
 ### Minimal Requirements
 
--	Each Zend Server Docker container requires 1GB of availible memory.
+Each Zend Server Docker container requires 1GB of availible memory.
 
 # License