Merge pull request #952 from emuus/3.8.fp7-11856

add OpenShift to supported image list - 3.8.fp7
usharesoft · Oct 15, 2018 · 0287f20 · 0287f20
2 parents 9c1b378 + ef91018
commit 0287f20
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/end-user/en/source/pages/generating/appliance-generate.rst b/end-user/en/source/pages/generating/appliance-generate.rst
@@ -69,17 +69,19 @@ To generate a machine image:
 
 .. _appliance-openshift-image:
 
-Generating an Openshift Image
+Generating an OpenShift Image
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. note:: You cannot generate an Openshift image from a Windows template or a Windows scan.
+.. note:: You cannot generate an OpenShift image from a Windows template or a Windows scan.
 
 To generate a machine image:
 	1. Go to the ``Apps`` tab.
 	2. Select the appliance from the ``Appliance Library``. 
 	3. Click on the ``generate`` button at the top right to display all possible image formats which can be generated. 
-	4. Choose ``Cloud``, then ``Openshift`` image format. 
+	4. Choose ``Cloud``, then ``OpenShift`` image format. 
 	5. Fill the entrypoint in exec form. For example ``["/usr/sbin/httpd", "-DFOREGROUND"]``.
 	6. Click the ``generate`` button to launch a generation in UForge for this appliance template. 
-	7. Once the generation is complete, the Openshift image will be listed in your library under ``Machine Images``.
+	7. Once the generation is complete, the OpenShift image will be listed in your library under ``Machine Images``.
+
+	.. note:: It is not possible to publish from a Docker image to OpenShift.
 
diff --git a/end-user/en/source/pages/generating/supported-image-type.rst b/end-user/en/source/pages/generating/supported-image-type.rst
@@ -88,6 +88,8 @@ With UForge you can create machine images in the following formats.
 +-------------------------------------+-------------------------------------------------------+
 | Google Compute Engine               | none                                                  |
 +-------------------------------------+-------------------------------------------------------+
+| OpenShift                           | not supported for a Windows-based appliance           |
++-------------------------------------+-------------------------------------------------------+
 | OpenStack                           | Target formats:                                       |
 |                                     | OpenStack QCOW2                                       |
 |                                     | OpenStack VMDK                                        |