Commit 06fe1554 authored by Andy Wilkinson's avatar Andy Wilkinson

Fix numbering of items in list of steps for Openshift deployment

The list continuation character '+' can be used to prevent a blank
line from ending a list, thereby allowing code blocks to be included
in a list. See "Complex content in outline lists" [1] for more
details.

[1] http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/#lists

Fixes #1025
parent 196f92bd
...@@ -236,7 +236,7 @@ that covers the steps that you need to follow when deploying to CloudBees. ...@@ -236,7 +236,7 @@ that covers the steps that you need to follow when deploying to CloudBees.
[[cloud-deployment-openshift]] [[cloud-deployment-openshift]]
=== Openshift == Openshift
https://www.openshift.com/[Openshift] is the RedHat public (and enterprise) PaaS solution. https://www.openshift.com/[Openshift] is the RedHat public (and enterprise) PaaS solution.
Like Heroku, it works by running scripts triggered by git commits, so you can script Like Heroku, it works by running scripts triggered by git commits, so you can script
the launching of a Spring Boot app in pretty much any way you like as long as the the launching of a Spring Boot app in pretty much any way you like as long as the
...@@ -250,23 +250,23 @@ The basic model is to: ...@@ -250,23 +250,23 @@ The basic model is to:
a `pre_build` hook (Java and Maven are installed by default, Gradle is not) a `pre_build` hook (Java and Maven are installed by default, Gradle is not)
2. Use a `build` hook to build your jar (using Maven or Gradle), e.g. 2. Use a `build` hook to build your jar (using Maven or Gradle), e.g.
+
---- ----
#!/bin/bash #!/bin/bash
cd $OPENSHIFT_REPO_DIR cd $OPENSHIFT_REPO_DIR
mvn package -s .openshift/settings.xml -DskipTests=true mvn package -s .openshift/settings.xml -DskipTests=true
---- ----
+
3. Add a `start` hook that calls `java -jar ...` 3. Add a `start` hook that calls `java -jar ...`
+
---- ----
#!/bin/bash #!/bin/bash
cd $OPENSHIFT_REPO_DIR cd $OPENSHIFT_REPO_DIR
nohup java -jar target/*.jar --server.port=${OPENSHIFT_DIY_PORT} --server.address=${OPENSHIFT_DIY_IP} & nohup java -jar target/*.jar --server.port=${OPENSHIFT_DIY_PORT} --server.address=${OPENSHIFT_DIY_IP} &
---- ----
+
4. Use a `stop` hook (since the start is supposed to return cleanly), e.g. 4. Use a `stop` hook (since the start is supposed to return cleanly), e.g.
+
---- ----
#!/bin/bash #!/bin/bash
source $OPENSHIFT_CARTRIDGE_SDK_BASH source $OPENSHIFT_CARTRIDGE_SDK_BASH
...@@ -278,10 +278,10 @@ else ...@@ -278,10 +278,10 @@ else
kill $PID kill $PID
fi fi
---- ----
+
5. Embed service bindings from environment variables provided by the platform 5. Embed service bindings from environment variables provided by the platform
in your `application.properties`, e.g. in your `application.properties`, e.g.
+
---- ----
spring.datasource.url: jdbc:mysql://${OPENSHIFT_MYSQL_DB_HOST}:${OPENSHIFT_MYSQL_DB_PORT}/${OPENSHIFT_APP_NAME} spring.datasource.url: jdbc:mysql://${OPENSHIFT_MYSQL_DB_HOST}:${OPENSHIFT_MYSQL_DB_PORT}/${OPENSHIFT_APP_NAME}
spring.datasource.username: ${OPENSHIFT_MYSQL_DB_USERNAME} spring.datasource.username: ${OPENSHIFT_MYSQL_DB_USERNAME}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment