Skip to content

Commit f4af923

Browse files
axilleaseread
andcommitted
Merge branch 'eread/update-project-to-use-ruby-3_2_2-based-docker-images-docs' into 'master'
Update project to use Ruby 3.2.2-based Docker images See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6915 Merged-by: Achilleas Pipinellis <[email protected]> Approved-by: Achilleas Pipinellis <[email protected]> Co-authored-by: Evan Read <[email protected]>
2 parents 5520ec8 + c0cb806 commit f4af923

File tree

7 files changed

+96
-95
lines changed

7 files changed

+96
-95
lines changed

.markdownlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,4 @@ proper-names:
149149
"YouTrack"
150150
]
151151
code_blocks: false
152+
html_elements: false

doc/build/team_member_docs.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ Check the following table for more information:
4343

4444
| Filename | Environment variable | Description |
4545
| ------------------------------------ | ------------------------------------ | ----------- |
46-
| VERSION | GITLAB_VERSION | Controls the Git reference of the GitLab Rails application. By default, points to the `master` branch of the GitLab-FOSS repository. If you want to use the GitLab repository, set the environment variable `ee` to true. |
47-
| GITALY_SERVER_VERSION | GITALY_SERVER_VERSION | Git reference of the [Gitaly](https://gitlab.com/gitlab-org/gitaly) repository. |
48-
| GITLAB_PAGES_VERSION | GITLAB_PAGES_VERSION | Git reference of the [GitLab Pages](https://gitlab.com/gitlab-org/gitlab-pages) repository.|
49-
| GITLAB_SHELL_VERSION | GITLAB_SHELL_VERSION | Git reference of the [GitLab Shell](https://gitlab.com/gitlab-org/gitlab-shell) repository.|
50-
| GITLAB_ELASTICSEARCH_INDEXER_VERSION | GITLAB_ELASTICSEARCH_INDEXER_VERSION | Git reference of the [GitLab Elasticsearch Indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer) repository. Used only in EE builds.|
51-
| GITLAB_KAS_VERSION | GITLAB_KAS_VERSION | Git reference of the [GitLab Kubernetes Agent Server](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent) repository.|
46+
| `VERSION` | `GITLAB_VERSION` | Controls the Git reference of the GitLab Rails application. By default, points to the `master` branch of the GitLab-FOSS repository. If you want to use the GitLab repository, set the environment variable `ee` to true. |
47+
| `GITALY_SERVER_VERSION` | `GITALY_SERVER_VERSION` | Git reference of the [Gitaly](https://gitlab.com/gitlab-org/gitaly) repository. |
48+
| `GITLAB_PAGES_VERSION` | `GITLAB_PAGES_VERSION` | Git reference of the [GitLab Pages](https://gitlab.com/gitlab-org/gitlab-pages) repository.|
49+
| `GITLAB_SHELL_VERSION` | `GITLAB_SHELL_VERSION` | Git reference of the [GitLab Shell](https://gitlab.com/gitlab-org/gitlab-shell) repository.|
50+
| `GITLAB_ELASTICSEARCH_INDEXER_VERSION` | `GITLAB_ELASTICSEARCH_INDEXER_VERSION` | Git reference of the [GitLab Elasticsearch Indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer) repository. Used only in EE builds.|
51+
| `GITLAB_KAS_VERSION` | `GITLAB_KAS_VERSION` | Git reference of the [GitLab Kubernetes Agent Server](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent) repository.|
5252

5353
If you are running the `e2e:package-and-test` job from a GitLab MR, the `GITLAB_VERSION`
5454
environment variable is set to the commit SHA corresponding to the pipeline.
@@ -107,13 +107,13 @@ below for details:
107107

108108
| Environment variable | Description |
109109
| --------------------------------------------- | ----------- |
110-
| ALTERNATIVE_PRIVATE_TOKEN | An access token used if needing to pull from private repositories. |
111-
| GITLAB_ALTERNATIVE_REPO | Git repository location for the GitLab Rails application. |
112-
| GITLAB_SHELL_ALTERNATIVE_REPO | Git repository location for [GitLab Shell](https://gitlab.com/gitlab-org/gitlab-shell). |
113-
| GITLAB_PAGES_ALTERNATIVE_REPO | Git repository location for [GitLab Pages](https://gitlab.com/gitlab-org/gitlab-pages). |
114-
| GITALY_SERVER_ALTERNATIVE_REPO | Git repository location for [Gitaly](https://gitlab.com/gitlab-org/gitaly). |
115-
| GITLAB_ELASTICSEARCH_INDEXER_ALTERNATIVE_REPO | Git repository location for [GitLab Elasticsearch Indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer). |
116-
| GITLAB_KAS_ALTERNATIVE_REPO | Git repository location for [GitLab Kubernetes Agent Server](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent). |
110+
| `ALTERNATIVE_PRIVATE_TOKEN` | An access token used if needing to pull from private repositories. |
111+
| `GITLAB_ALTERNATIVE_REPO` | Git repository location for the GitLab Rails application. |
112+
| `GITLAB_SHELL_ALTERNATIVE_REPO` | Git repository location for [GitLab Shell](https://gitlab.com/gitlab-org/gitlab-shell). |
113+
| `GITLAB_PAGES_ALTERNATIVE_REPO` | Git repository location for [GitLab Pages](https://gitlab.com/gitlab-org/gitlab-pages). |
114+
| `GITALY_SERVER_ALTERNATIVE_REPO` | Git repository location for [Gitaly](https://gitlab.com/gitlab-org/gitaly). |
115+
| `GITLAB_ELASTICSEARCH_INDEXER_ALTERNATIVE_REPO` | Git repository location for [GitLab Elasticsearch Indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer). |
116+
| `GITLAB_KAS_ALTERNATIVE_REPO` | Git repository location for [GitLab Kubernetes Agent Server](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent). |
117117

118118
## Build packages for other operating systems
119119

0 commit comments

Comments
 (0)