Merge pull request #1123 from NottyCode/master

Add docs for new tags for open-liberty image

open-liberty/content.md

@@ -13,11 +13,22 @@ FROM %%IMAGE%%:kernel
 COPY server.xml /config/
 ```
 
+The `microProfile1` image contains the features required to implement Eclipse MicroProfile 1.2. The `webProfile7` image contains the features required for Java EE7 Web Profile compliance. The `javaee7` image adds the features required for Java EE7 Full Platform compliance. The `javaee7` image is also tagged with `latest`.
+
 There are also additional images for different JVM combinations. Currently there are tags for java8 only, but there are two variants one based on IBM Java and Ubuntu and the other based on the IBM small footprint Java which is based on alpine linux. The naming structure for the variants is tag-javaversion-vandor/variant. This leads to kernel-java8-ibmsfj as one. At this time the full list of images are:
 
 	kernel
 	kernel-java8-ibm
 	kernel-java8-ibmsfj
+	microProfile1
+	microProfile1-java8-ibm
+	microProfile1-java8-ibmsfj
+	webProfile7
+	webProfile7-java8-ibm
+	webProfile7-java8-ibmsfj
+	javaee7
+	javaee7-java8-ibm
+	javaee7-java8-ibmsfj
 
 # Usage
 
@@ -28,7 +39,7 @@ The images are designed to support a number of different usage patterns. The fol
 	```console
 	$ docker run -d -p 80:9080 -p 443:9443 \
 	    -v /tmp/DefaultServletEngine/dropins/Sample1.war:/config/dropins/Sample1.war \
-	    %%IMAGE%%:kernel
+	    %%IMAGE%%:webProfile7
 	```
 
 	When the server is started, you can browse to http://localhost/Sample1/SimpleServlet on the Docker host.
@@ -38,13 +49,13 @@ The images are designed to support a number of different usage patterns. The fol
 	```console
 	$ docker run -d -p 80:9080 \
 	  -v /tmp/DefaultServletEngine:/config \
-	  %%IMAGE%%:kernel-sfj
+	  %%IMAGE%%:webProfile7-sfj
 	```
 
 3.	You can also build an application layer on top of this image by using either the default server configuration or a new server configuration. In this example, we have copied the `Sample1.war` from `/tmp/DefaultServletEngine/dropins` to the same directory as the following Dockerfile.
 
 	```dockerfile
-	FROM %%IMAGE%%:kernel
+	FROM %%IMAGE%%:webProfile7
 	ADD Sample1.war /config/dropins/
 	```
 
@@ -60,7 +71,7 @@ The images are designed to support a number of different usage patterns. The fol
 	Build and run the data volume container:
 
 	```dockerfile
-	FROM %%IMAGE%%:kernel
+	FROM %%IMAGE%%:webProfile7
 	ADD DefaultServletEngine /config
 	```
 
@@ -74,7 +85,7 @@ The images are designed to support a number of different usage patterns. The fol
 
 	```console
 	$ docker run -d -p 80:9080 \
-	  --volumes-from app %%IMAGE%%:kernel
+	  --volumes-from app %%IMAGE%%:webProfile7
 	```
 
 # Providing your own keystore/truststore
@@ -124,7 +135,7 @@ Liberty writes to two different directories when running: `/opt/ol/wlp//output`
 ```console
 docker run -d -p 80:9080 -p 443:9443 \
     --tmpfs /opt/ol/wlp//output --tmpfs /logs -v /config --read-only \
-    %%IMAGE%%:kernel
+    %%IMAGE%%:webProfile7
 ```
 
 # Relationship between Open Liberty and WebSphere Liberty