Parcourir la source

Fixed up formatting for OS3

- Fixed the formatting for OpenShift 3
- Fixed a link in the docker run docs

Signed-off-by: JJ Asghar <jjasghar@gmail.com>
Signed-off-by: JJ Asghar <awesome@ibm.com>
JJ Asghar il y a 5 ans
Parent
commit
af75408d05
2 fichiers modifiés avec 19 ajouts et 3 suppressions
  1. 18 2
      README.md
  2. 1 1
      doc/docker/install.md

+ 18 - 2
README.md

@@ -110,12 +110,28 @@ Try Huginn on Heroku: [![Deploy](https://www.herokucdn.com/deploy/button.png)](h
 
 Huginn launches on the free version of Heroku [with significant limitations](https://github.com/huginn/huginn/blob/master/doc/heroku/install.md). For non-experimental use, we strongly recommend Heroku's 1GB paid plan or our Docker container.
 
-### OpenShift Online (v3)
+### OpenShift
 
-Try Huginn on OpenShift Online (v3): `oc new-app -f https://raw.githubusercontent.com/huginn/huginn/master/openshift/templates/huginn-mysql.json` or `oc new-app -f https://raw.githubusercontent.com/huginn/huginn/master/openshift/templates/huginn-postgresql.json`. You can also use the web console to import either json file by going to "Add to Project" -> "Import YAML/JSON".
+#### OpenShift v3
+
+Try Huginn on OpenShift Online (v3)
+
+Create a new app with either `mysql` or `postgres`:
+```bash
+oc new-app -f https://raw.githubusercontent.com/huginn/huginn/master/openshift/templates/huginn-mysql.json
+```
+or
+```bash
+oc new-app -f https://raw.githubusercontent.com/huginn/huginn/master/openshift/templates/huginn-postgresql.json
+```
+**Note**: You can also use the web console to import either json file by going to "Add to Project" -> "Import YAML/JSON".
 
 If you are on the Starter plan, make sure to follow the [guide](https://docs.openshift.com/online/getting_started/beyond_the_basics.html#btb-creating-a-new-application-from-source-code) to remove any existing application.
 
+##### OpenShift v4
+
+If you would like to run this on OpenShift v4+ you should look at the [Docker](https://github.com/huginn/huginn/blob/master/doc/docker/install.md) documentaition as your deployment process.
+
 ### Manual installation on any server
 
 Have a look at the [installation guide](https://github.com/huginn/huginn/blob/master/doc/manual/README.md).

+ 1 - 1
doc/docker/install.md

@@ -22,7 +22,7 @@ Getting Huginn up and running using docker is quick and painless once you have d
 * Follow the installation instructions untill you can successfully run `docker ps`
 * Get the the IP of the VM running docker by running `docker-machine ls`
 * Start your Huginn container using `docker run -it -p 3000:3000 huginn/huginn`
-* Open Huginn in the browser [http://docker-machine ip:3000](http://<docker-machine ip>:3000)
+* Open Huginn in the browser [http://docker-machine ip:3000](http://docker-machine ip:3000)
 * Log in to your Huginn instance using the username `admin` and password `password`
 
 #### Linux