Commit f0e58a3b authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Fix different Markdown styles

parent 3ec93e79
...@@ -80,7 +80,7 @@ Install, upgrade, integrate, migrate to GitLab: ...@@ -80,7 +80,7 @@ Install, upgrade, integrate, migrate to GitLab:
| :------------ | :------: | --------------: | | :------------ | :------: | --------------: |
| [Video Tutorial: Idea to Production on Google Container Engine (GKE)](https://about.gitlab.com/2017/01/23/video-tutorial-idea-to-production-on-google-container-engine-gke/) | Tutorial | 2017/01/23 | | [Video Tutorial: Idea to Production on Google Container Engine (GKE)](https://about.gitlab.com/2017/01/23/video-tutorial-idea-to-production-on-google-container-engine-gke/) | Tutorial | 2017/01/23 |
| [How to Setup a GitLab Instance on Microsoft Azure](https://about.gitlab.com/2016/07/13/how-to-setup-a-gitlab-instance-on-microsoft-azure/) | Tutorial | 2016/07/13 | | [How to Setup a GitLab Instance on Microsoft Azure](https://about.gitlab.com/2016/07/13/how-to-setup-a-gitlab-instance-on-microsoft-azure/) | Tutorial | 2016/07/13 |
| [Get started with OpenShift Origin 3 and GitLab](https://docs.gitlab.com/ee/articles/openshift_and_gitlab/) | Tutorial | 2016/06/28 | | [Get started with OpenShift Origin 3 and GitLab](openshift_and_gitlab/index.md) | Tutorial | 2016/06/28 |
| [Getting started with GitLab and DigitalOcean](https://about.gitlab.com/2016/04/27/getting-started-with-gitlab-and-digitalocean/) | Tutorial | 2016/04/27 | | [Getting started with GitLab and DigitalOcean](https://about.gitlab.com/2016/04/27/getting-started-with-gitlab-and-digitalocean/) | Tutorial | 2016/04/27 |
## Software development ## Software development
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
> **Author:** [Achilleas Pipinellis](https://gitlab.com/axil) || > **Author:** [Achilleas Pipinellis](https://gitlab.com/axil) ||
> **Publication date:** 2016/06/28 > **Publication date:** 2016/06/28
## Introduction ## Introduction
[OpenShift Origin][openshift] is an open source container application [OpenShift Origin][openshift] is an open source container application
...@@ -18,14 +17,6 @@ tools that will help us achieve our goal. ...@@ -18,14 +17,6 @@ tools that will help us achieve our goal.
--- ---
### What's on this page?
{: .no_toc}
- TOC
{:toc}
---
## Prerequisites ## Prerequisites
OpenShift 3 is not yet deployed on RedHat's offered Online platform ([openshift.com]), OpenShift 3 is not yet deployed on RedHat's offered Online platform ([openshift.com]),
...@@ -45,16 +36,11 @@ latest Origin release is used: ...@@ -45,16 +36,11 @@ latest Origin release is used:
- **openshift** `v1.3.0` (is pre-installed in the [VM image][vm-new]) - **openshift** `v1.3.0` (is pre-installed in the [VM image][vm-new])
- **kubernetes** `v1.3.0` (is pre-installed in the [VM image][vm-new]) - **kubernetes** `v1.3.0` (is pre-installed in the [VM image][vm-new])
<div class="panel panel-info"> >**Note:**
**Note**
{: .panel-heading}
<div class="panel-body">
If you intend to deploy GitLab on a production OpenShift cluster, there are some If you intend to deploy GitLab on a production OpenShift cluster, there are some
limitations to bare in mind. Read on the [limitations](#current-limitations) limitations to bare in mind. Read on the [limitations](#current-limitations)
section for more information and follow the linked links for the relevant section for more information and follow the linked links for the relevant
discussions. discussions.
</div>
</div>
Now that you have all batteries, let's see how easy it is to test OpenShift Now that you have all batteries, let's see how easy it is to test OpenShift
on your computer. on your computer.
...@@ -268,10 +254,7 @@ And then let's import it in OpenShift: ...@@ -268,10 +254,7 @@ And then let's import it in OpenShift:
oc create -f openshift-template.json -n openshift oc create -f openshift-template.json -n openshift
``` ```
<div class="panel panel-info"> >**Note:**
**Note**
{: .panel-heading}
<div class="panel-body">
The `-n openshift` namespace flag is a trick to make the template available to all The `-n openshift` namespace flag is a trick to make the template available to all
projects. If you recall from when we created the `gitlab` project, `oc` switched projects. If you recall from when we created the `gitlab` project, `oc` switched
to it automatically, and that can be verified by the `oc status` command. If to it automatically, and that can be verified by the `oc status` command. If
...@@ -279,8 +262,6 @@ you omit the namespace flag, the application will be available only to the ...@@ -279,8 +262,6 @@ you omit the namespace flag, the application will be available only to the
current project, in our case `gitlab`. The `openshift` namespace is a global current project, in our case `gitlab`. The `openshift` namespace is a global
one that the administrators should use if they want the application to be one that the administrators should use if they want the application to be
available to all users. available to all users.
</div>
</div>
We are now ready to finally deploy GitLab! We are now ready to finally deploy GitLab!
...@@ -320,16 +301,11 @@ If you are deploying to production you will want to change the **GitLab instance ...@@ -320,16 +301,11 @@ If you are deploying to production you will want to change the **GitLab instance
hostname** and use greater values for the volume sizes. If you don't provide a hostname** and use greater values for the volume sizes. If you don't provide a
password for PostgreSQL, it will be created automatically. password for PostgreSQL, it will be created automatically.
<div class="panel panel-info"> >**Note:**
**Note**
{: .panel-heading}
<div class="panel-body">
The `gitlab.apps.10.2.2.2.xip.io` hostname that is used by default will The `gitlab.apps.10.2.2.2.xip.io` hostname that is used by default will
resolve to the host with IP `10.2.2.2` which is the IP our VM uses. It is a resolve to the host with IP `10.2.2.2` which is the IP our VM uses. It is a
trick to have distinct FQDNs pointing to services that are on our local network. trick to have distinct FQDNs pointing to services that are on our local network.
Read more on how this works in <http://xip.io>. Read more on how this works in <http://xip.io>.
</div>
</div>
Now that we configured this, let's see how to manage and scale GitLab. Now that we configured this, let's see how to manage and scale GitLab.
......
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