Skip to content

Commit cb07a02

Browse files
chendelin1982chendelin1982
committed
upgrade
1 parent c3c7351 commit cb07a02

File tree

7 files changed

+74
-50
lines changed

7 files changed

+74
-50
lines changed

‎docs/.vuepress/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ base: '/docs/gitlab/',
66
dest: 'html/gitlab',
77

88
head: [
9-
['link', { rel: 'icon', href: '/favcon.ico' }]
9+
['link', { rel: 'icon', href: '/favicon.ico' }]
1010
],
1111

1212
//vuepress多语言，区别于主题多语言

‎docs/.vuepress/public/favcon.ico‎

-1.12 KB
Binary file not shown.

‎docs/.vuepress/public/favicon.ico.ico‎

9.44 KB
Binary file not shown.

‎docs/solution-upgrade.md‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,33 +32,40 @@ GitLab officially provides **level by level**[upgrade plan](https://docs.gitlab.
3232

3333
The update method of updating to a specified version is very useful. On the one hand, it meets the requirements of a specific version of the user, and on the other hand, it achieves a **gradual upgrade** in this way, which solves the situation that the version span is too large to be upgraded.
3434

35-
For example: Gitlab12 to GitLab14 cannot be upgraded directly, you need to refer to the official step-by-step [upgrade path](https://docs.gitlab.com/ee/update/index.html#upgrade-paths) to achieve this. Our upgrade purpose.
35+
For example: Gitlab12 to GitLab14 cannot be upgraded directly, you need to refer to the official step-by-step [upgrade path](https://docs.gitlab.com/ee/update/index.html#upgrade-paths) to achieve this.
3636

37-
1. Retrieve the required version (ce can be replaced with ee)
37+
Take the Gitlab 13.0.14 to GitLab 14.1.6 as sample for your reference below:
3838

39-
```
40-
# Ubuntu/Debian
41-
sudo apt-cache madison gitlab-ce
39+
1. Get the **upgrade paths** from [official docs](https://docs.gitlab.com/ee/update/index.html#upgrade-paths), computing your correct path like this:
40+
```
41+
13.0.14 -> 13.1.11 -> 13.8.8 -> 13.12.10 -> 13.12.12 -> 14.0.11 -> 14.1.6
42+
```
4243

43-
# RHEL/CentOS 6 and 7
44-
yum --showduplicates list gitlab-ce
44+
2. Optional step: search all versions in GitLab repository (ce can be instead to ee)
45+
```
46+
# Ubuntu/Debian
47+
sudo apt-cache madison gitlab-ce
4548
46-
# RHEL/CentOS 8
47-
dnf --showduplicates list gitlab-ce
48-
```
49+
# RHEL/CentOS 6 and 7
50+
yum --showduplicates list gitlab-ce
4951
50-
2. Install the specified version
52+
# RHEL/CentOS 8
53+
dnf --showduplicates list gitlab-ce
54+
```
5155

52-
```
53-
# Ubuntu/Debian
54-
sudo apt install gitlab-ce<version>
56+
3. Update step by step
57+
```
58+
# Ubuntu/Debian
59+
sudo apt install gitlab-ce-<version>
5560
56-
# RHEL/CentOS 6 and 7
57-
yum install gitlab-ce-<version>
61+
# RHEL/CentOS 6 and 7
62+
yum install gitlab-ce-<version>
5863
59-
# RHEL/CentOS 8
60-
dnf install gitlab-ee-<version>
61-
```
64+
# RHEL/CentOS 8
65+
dnf install gitlab-ce-<version>
66+
```
67+
68+
> If you update by `yum install gitlab-ce` which not include version, it mean update to latest version
6269
6370
## CE to EE
6471

‎docs/stack-accounts.md‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Username and Password
22

3-
These accounts are required for GitLab image installation and configuration
3+
Use the **SSH** to connect your Server and run the command `sudo cat /credentials/password.txt` to get the username and password of this deployment solution.
4+
5+
![](https://libs.websoft9.com/Websoft9/DocsPicture/zh/common/catdbpassword-websoft9.png)
6+
7+
Here are the required username and password for RabbitMQ installation and configuration.
48

59
## GitLab
610

@@ -13,15 +17,16 @@ Omnibus GitLab use the PostgreSQL Peer Authentication mode for local connection,
1317

1418
## Linux
1519

16-
* Host Name: Internet IP or Public IP of your Instance
20+
* Host Name: Server's Internet IP or Public IP of your Instance
1721
* Connect by: Online SSH on Cloud Console or SFTP/SSH tools on your local computer
18-
* Password: It was set by yourself when created instance
19-
* Username: Different Cloud Platform has differences
20-
| Cloud Platform | Administrator Username | Other |
21-
| --- | --- | --- |
22-
| Azure | It was set by yourself when created instance | [How to enable root access?](https://support.websoft9.com/docs/azure/server-login.html#sample2-enable-the-root-username) |
23-
| AWS CentOS | centos | [How to enable root access?](https://support.websoft9.com/docs/aws/server-login.html#sample2-enable-the-root-username) |
24-
| AWS Ubuntu | ubuntu | [How to enable root access?](https://support.websoft9.com/docs/aws/server-login.html#sample2-enable-the-root-username) |
25-
| Alibaba Cloud, HUAWEI CLOUD, Tencent Cloud | root |
26-
27-
If don't remember the password of Linux, you should reset password on Cloud Console
22+
* Password: It was set by yourself when created instance.
23+
* Username: Different Cloud Platform has differences.
24+
| Cloud Platform | OS | Administrator Username | Other |
25+
| --- | --- | --- | --- |
26+
| Azure | ALL | It was set by yourself when created instance. | [How to enable root access?](https://support.websoft9.com/docs/azure/server-login.html#sample2-enable-the-root-username) |
27+
| AWS | CentOS | centos | [How to enable root access?](https://support.websoft9.com/docs/aws/server-login.html#sample2-enable-the-root-username) |
28+
| AWS | Amazon Linux | ec2-user | [How to enable root access?](https://support.websoft9.com/docs/aws/server-login.html#sample2-enable-the-root-username) |
29+
| AWS | Ubuntu | ubuntu | [How to enable root access?](https://support.websoft9.com/docs/aws/server-login.html#sample2-enable-the-root-username) |
30+
| Alibaba Cloud, HUAWEI CLOUD, Tencent Cloud | ALL | root ||
31+
32+
> If you forgot the password of Linux, reset it on Cloud Console.

‎docs/zh/solution-upgrade.md‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
网站技术日新月异，**更新升级**是维护工作之一，长时间不升级的程序，就如长时间不维护的建筑物一样，会加速老化、功能逐渐缺失直至无法使用。
44

55
这里注意更新与升级这两词的差异（[延伸阅读](https://support.websoft9.com/docs/faq/zh/tech-upgrade.html#更新-vs-升级)），例如：
6-
- 操作系统打个补丁常称之为**更新**，Ubuntu16.04 变更为 Ubuntu18.04，称之为**升级**
6+
- 操作系统打个补丁常称之为**更新**，Ubuntu 20.04 变更为 Ubuntu 21.04，称之为**升级**
77
- MySQL5.6.25-->MySQL5.6.30 常称之为**更新**，MySQL5.6->MySQL5.7 称之为**升级**
88

99
GitLab 完整的更新升级包括：系统级更新（操作系统和运行环境）和 GitLab 程序升级两种类型
@@ -24,15 +24,18 @@ yum update -y
2424

2525
## GitLab升级
2626

27-
GitLab 官方提供了**逐级**[升级方案](https://docs.gitlab.com/omnibus/update/README.html#updating-using-the-official-repositories)，每个版本对应有升级路径，须逐步升级到**指定版本**，方法如下：
27+
GitLab 是一个企业级软件，它所采用了大量的第三方开源组件，它的升级是一个系统化工程。
2828

29-
### 指定版本升级
29+
所幸，GitLab 官方提供了一个稳妥可靠的 **逐级** [升级方案](https://docs.gitlab.com/omnibus/update/README.html#updating-using-the-official-repositories) 以弥补由于当前版本与最新版本之间的跨度太大儿无法升级的问题。
3030

31-
更新到指定版本的更新方法非常有用，一方面满足用户的特定版本的要求，另外一方面通过这种方式实现**逐级**升级，解决版本跨度太大而无法升级的情况。
31+
下面以 Gitlab 13.0.14 升级至 GitLab 14.1.6 为例，介绍详细的升级方案：
3232

33-
例如：Gitlab12 升级至 GitLab14 是无法直接升级的，需要参考官方提供的逐级[升级路径](https://docs.gitlab.com/ee/update/index.html#upgrade-paths)，方可实现我们的升级目的。
33+
1. 查询官方[升级路径](https://docs.gitlab.com/ee/update/index.html#upgrade-paths)文档，确认升级路径
34+
```
35+
13.0.14 -> 13.1.11 -> 13.8.8 -> 13.12.10 -> 13.12.12 -> 14.0.11 -> 14.1.6
36+
```
3437

35-
1. 检索出所需的版本（ce 可替换成 ee）
38+
2. 可选步骤：检索当前升级库是否提供上述路径的各种版本（ce 可替换成 ee）
3639
```
3740
# Ubuntu/Debian
3841
sudo apt-cache madison gitlab-ce
@@ -43,18 +46,22 @@ GitLab 官方提供了**逐级**[升级方案](https://docs.gitlab.com/omnibus/u
4346
# RHEL/CentOS 8
4447
dnf --showduplicates list gitlab-ce
4548
```
46-
2. 安装指定版本
49+
50+
3. 根据升级路径，一级一级逐渐向上升
4751
```
4852
# Ubuntu/Debian
49-
sudo apt install gitlab-ce<version>
53+
sudo apt install gitlab-ce-<version>
5054
5155
# RHEL/CentOS 6 and 7
5256
yum install gitlab-ce-<version>
5357
5458
# RHEL/CentOS 8
55-
dnf install gitlab-ee-<version>
59+
dnf install gitlab-ce-<version>
5660
```
5761

62+
> 如果不填写版本号，例如：yum install gitlab-ce，即表明升级到最新版本。
63+
64+
5865
## CE升级到EE
5966

6067
GitLab Community Edition (CE) 升级到同版本的 GitLab Enterprise Edition 的操作步骤如下：

‎docs/zh/stack-accounts.md‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
# 账号密码
22

3-
使用GitLab，可能会用到的几组账号密码如下：
3+
通过**SSH**连接云服务器，运行 `sudo cat /credentials/password.txt` 命令，查看所有相关账号和密码
4+
5+
![](https://libs.websoft9.com/Websoft9/DocsPicture/zh/common/catdbpassword-websoft9.png)
6+
7+
下面列出可能需要用到的几组账号密码：
48

59
## GitLab
610

7-
Administrator username：`root`
8-
Administrator password：存储在您的服务器中的文件中 */credentials/password.txt*
11+
* 管理员账号: `admin`
12+
* 管理员密码: `admin` 或 存储在您的服务器中的文件中 */credentials/password.txt*
913

1014
## PostgreSQL
1115

@@ -17,9 +21,10 @@ Omnibus GitLab 使用的是 Peer 认证模式，即从操作系统获得客户
1721
* 连接方式：云控制台在线SSH 或 SFTP客户端工具 或 SSH客户端工具
1822
* 管理员密码：创建服务器的时候自行设置，若不记得密码需要通过云控制台重置。
1923
* 管理员账号：不同的云平台有一定的差异
20-
| 云平台 | 管理员账号 | 其他|
21-
| --- | --- | --- |
22-
| Azure | 创建服务器的时候自行设置 | [如何开启root账户？](https://support.websoft9.com/docs/azure/zh/server-login.html#示例2：启用系统root账号) |
23-
| AWS Centos 系统 | centos | [如何开启root账户？](https://support.websoft9.com/docs/aws/zh/server-login.html#示例2：启用系统root账号) |
24-
| AWS Ubuntu 系统 | ubuntu | [如何开启root账户？](https://support.websoft9.com/docs/aws/zh/server-login.html#示例2：启用系统root账号) |
25-
| 阿里云，华为云，腾讯云 | root | |
24+
| 云平台 | 系统 | 管理员账号名称 | 其他|
25+
| --- | --- | --- | --- |
26+
| Azure | 所有 | 创建服务器的时候自行设置 | [如何开启root账户？](https://support.websoft9.com/docs/azure/zh/server-login.html#示例2-启用系统root账号) |
27+
| AWS | CentOS | centos | [如何开启root账户？](https://support.websoft9.com/docs/aws/zh/server-login.html#示例2-启用系统root账号) |
28+
| AWS | AmazonLinux | ec2-user | [如何开启root账户？](https://support.websoft9.com/docs/aws/zh/server-login.html#示例2-启用系统root账号) |
29+
| AWS | Ubuntu | ubuntu | [如何开启root账户？](https://support.websoft9.com/docs/aws/zh/server-login.html#示例2-启用系统root账号) |
30+
| 阿里云，华为云，腾讯云 | 所有 | root | |

0 commit comments

Comments
 (0)