summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-17 16:38:31 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-09-17 16:38:31 -0400
commit62c0e5ab6a8ff88510d9ed0e2731ae6fda8bbacd (patch)
treeff449e8a2b2d1bdf92d0f82df4246ef5287b2239
parenteae049505c3bb6a09e524949e81335d0aa3f8e6f (diff)
downloadgitlab-ce-62c0e5ab6a8ff88510d9ed0e2731ae6fda8bbacd.tar.gz
Redcarpet didn't like unordered lists deeply nested in an ordered one
I don't really like making these an ordered list since they're mutually exclusive, but I think the structure is what's important. [ci skip]
-rw-r--r--doc/migrate_ci_to_ce/README.md82
1 files changed, 41 insertions, 41 deletions
diff --git a/doc/migrate_ci_to_ce/README.md b/doc/migrate_ci_to_ce/README.md
index 2f59dc69943..34b70c7140c 100644
--- a/doc/migrate_ci_to_ce/README.md
+++ b/doc/migrate_ci_to_ce/README.md
@@ -111,52 +111,52 @@ each installation.
# socket: /tmp/mysql.sock
```
-1. Depending on the values for `adapter`, you will have to use different
- commands to perform the database dump.
+1. Depending on the values for `adapter`, you will have to use one of three
+ different commands to perform the database dump.
**NOTE:** For any of the commands below, you'll need to substitute the
values `IN_UPPERCASE` with the corresponding values from your **CI
installation's** `config/database.yml` files above.
- - If both your CI and CE (or EE) installations use **mysql2** as the `adapter`, use
- `mysqldump`:
-
- ```sh
- mysqldump --default-character-set=utf8 --complete-insert --no-create-info \
- --host=DB_USERNAME --port=DB_PORT --user=DB_HOSTNAME -p GITLAB_CI_DATABASE \
- ci_application_settings ci_builds ci_commits ci_events ci_jobs ci_projects \
- ci_runner_projects ci_runners ci_services ci_tags ci_taggings ci_trigger_requests \
- ci_triggers ci_variables ci_web_hooks > gitlab_ci.sql
- ```
-
- - If both your CI and CE (or EE) installations use **postgresql** as the
- `adapter`, use `pg_dump`:
-
- ```sh
- pg_dump -h DB_HOSTNAME -U DB_USERNAME -p DB_PORT \
- --data-only GITLAB_CI_DATABASE -t "ci_*" > gitlab_ci.sql
- ```
-
- - If your CI installation uses **mysql2** as the `adapter` and your CE (or
- EE) installation uses **postgresql**, use `mysqldump` to dump the database
- and then convert it to PostgreSQL using [mysql-postgresql-converter]:
-
- ```sh
- # Dump existing MySQL database first
- mysqldump --default-character-set=utf8 --compatible=postgresql --complete-insert \
- --host=DB_USERNAME --port=DB_PORT --user=DB_HOSTNAME -p GITLAB_CI_DATABASE \
- ci_application_settings ci_builds ci_commits ci_events ci_jobs ci_projects \
- ci_runner_projects ci_runners ci_services ci_tags ci_taggings ci_trigger_requests \
- ci_triggers ci_variables ci_web_hooks > gitlab_ci.sql.tmp
-
- # Convert database to be compatible with PostgreSQL
- git clone https://github.com/gitlabhq/mysql-postgresql-converter.git -b gitlab
- python mysql-postgresql-converter/db_converter.py gitlab_ci.sql.tmp gitlab_ci.sql.tmp2
- ed -s gitlab_ci.sql.tmp2 < mysql-postgresql-converter/move_drop_indexes.ed
-
- # Filter to only include INSERT statements
- grep "^\(START\|SET\|INSERT\|COMMIT\)" gitlab_ci.sql.tmp2 > gitlab_ci.sql
- ```
+ 1. If both your CI and CE (or EE) installations use **mysql2** as the `adapter`, use
+ `mysqldump`:
+
+ ```sh
+ mysqldump --default-character-set=utf8 --complete-insert --no-create-info \
+ --host=DB_USERNAME --port=DB_PORT --user=DB_HOSTNAME -p GITLAB_CI_DATABASE \
+ ci_application_settings ci_builds ci_commits ci_events ci_jobs ci_projects \
+ ci_runner_projects ci_runners ci_services ci_tags ci_taggings ci_trigger_requests \
+ ci_triggers ci_variables ci_web_hooks > gitlab_ci.sql
+ ```
+
+ 1. If both your CI and CE (or EE) installations use **postgresql** as the
+ `adapter`, use `pg_dump`:
+
+ ```sh
+ pg_dump -h DB_HOSTNAME -U DB_USERNAME -p DB_PORT \
+ --data-only GITLAB_CI_DATABASE -t "ci_*" > gitlab_ci.sql
+ ```
+
+ 1. If your CI installation uses **mysql2** as the `adapter` and your CE (or
+ EE) installation uses **postgresql**, use `mysqldump` to dump the
+ database and then convert it to PostgreSQL using [mysql-postgresql-converter]:
+
+ ```sh
+ # Dump existing MySQL database first
+ mysqldump --default-character-set=utf8 --compatible=postgresql --complete-insert \
+ --host=DB_USERNAME --port=DB_PORT --user=DB_HOSTNAME -p GITLAB_CI_DATABASE \
+ ci_application_settings ci_builds ci_commits ci_events ci_jobs ci_projects \
+ ci_runner_projects ci_runners ci_services ci_tags ci_taggings ci_trigger_requests \
+ ci_triggers ci_variables ci_web_hooks > gitlab_ci.sql.tmp
+
+ # Convert database to be compatible with PostgreSQL
+ git clone https://github.com/gitlabhq/mysql-postgresql-converter.git -b gitlab
+ python mysql-postgresql-converter/db_converter.py gitlab_ci.sql.tmp gitlab_ci.sql.tmp2
+ ed -s gitlab_ci.sql.tmp2 < mysql-postgresql-converter/move_drop_indexes.ed
+
+ # Filter to only include INSERT statements
+ grep "^\(START\|SET\|INSERT\|COMMIT\)" gitlab_ci.sql.tmp2 > gitlab_ci.sql
+ ```
[mysql-postgresql-converter]: https://github.com/gitlabhq/mysql-postgresql-converter