Updates based on PR feedback

websphere-liberty/README-short.txt

@@ -1 +1 @@
-Official IBM WebSphere Application Server for Developers V8.5.5 Liberty Profile image.
+Official IBM WebSphere Application Server for Developers Liberty Profile image.

websphere-liberty/content.md

@@ -1,9 +1,8 @@
 # Overview 
 
-This image contains IBM WebSphere Application Server for Developers V8.5.5
-Liberty Profile and the IBM Java Runtime Environment 7.1 SR1. For more
-information on WebSphere Application Server Liberty Profile, see the
-[WASdev][getting-started] site.
+This image contains IBM WebSphere Application Server for Developers Liberty
+Profile and the IBM Java Runtime Environment. For more information on WebSphere
+Application Server Liberty Profile, see the [WASdev][getting-started] site.
 
 # Usage
 
@@ -14,14 +13,19 @@ image. You can also view the license terms by setting this variable to
 `view`. Failure to set the variable will result in the termination of the
 container with a usage statement.
 
-The image is designed to support a number of different usage patterns. The following examples are based on the Liberty [application deployment sample][sample] and assume that [DefaultServletEngine.zip][zip] has been extracted to `/tmp` and the `server.xml` updated to accept connections from outside of the container by adding the following element inside the `server` stanza:
+The image is designed to support a number of different usage
+patterns. The following examples are based on the Liberty [application
+deployment sample][sample] and assume that
+[DefaultServletEngine.zip][zip] has been extracted to `/tmp` and the
+`server.xml` updated to accept HTTP connections from outside of the
+container by adding the following element inside the `server` stanza:
 
 ```
-<httpEndpoint host="*" httpPort="9080" httpsPort="9443"/>
+<httpEndpoint host="*" httpPort="9080" httpsPort="-1"/>
 ```
 
 1. The image contains a default server configuration that specifies the
-`webProfile-6.0` feature and exposes ports 9080 and 9443 for HTTP and HTTPs
+`webProfile-6.0` feature and exposes ports 9080 and 9443 for HTTP and HTTPS
 respectively. A WAR file can therefore be mounted in to the `dropins` directory
 of this server and run. The following example starts a container in the
 background running a WAR file from the host file system with the HTTP and HTTPS
@@ -36,14 +40,16 @@ ports mapped to 80 and 443 respectively.
     Once the server has started, you can browse to
     http://localhost/Sample1/SimpleServlet on the Docker host.
 
-2. For greater flexibility over configuration, it is possible to mount an entire
-server configuration directory from the host and then specify the server name as
-a parameter to the run command.
+2. For greater flexibility over configuration, it is possible to mount
+an entire server configuration directory from the host and then
+specify the server name as a parameter to the run command. Note that
+this particular example server configuration only provides HTTP
+access.
 
     ```
-    docker run -e LICENSE=accept -d -p 80:9080 -p 443:9443 \
+    docker run -e LICENSE=accept -d -p 80:9080 \
       -v /tmp/DefaultServletEngine:/opt/ibm/wlp/usr/servers/DefaultServletEngine \
-      websphere-liberty DefaultServletEngine
+      websphere-liberty /opt/ibm/wlp/bin/server run DefaultServletEngine
     ```
     
 3. It is also possible to build an application layer on top of this image using
@@ -58,6 +64,13 @@ the following Dockerfile.
     ENV LICENSE accept
     ```
 
+This can then be built and run as follows:
+
+    ```
+    docker build -t app .
+    docker run -d -p 80:9080 -p 443:9443 app
+    ```
+
 4. Lastly, it is possible to mount a data volume container containing the
 application and the server configuration on to the image. This has the benefit
 that it has no dependency on files from the host but still allows the
@@ -69,7 +82,7 @@ Dockerfile.
     Build and run the data volume container:
     
     ```
-    FROM ubuntu:14.04
+    FROM websphere-liberty
     ADD DefaultServletEngine /opt/ibm/wlp/usr/servers/DefaultServletEngine
     ```
     
@@ -83,8 +96,9 @@ Dockerfile.
     volume container mounted:
 
     ```
-    docker run -e LICENSE=accept -d -p 80:9080 -p 443:9443 \
-      --volumes-from app websphere-liberty DefaultServletEngine
+    docker run -e LICENSE=accept -d -p 80:9080 \
+      --volumes-from app websphere-liberty \
+      /opt/ibm/wlp/bin/server run DefaultServletEngine
     ```
 
 [getting-started]: https://developer.ibm.com/wasdev/docs/category/getting-started/