Skip to content
Snippets Groups Projects
Commit 02a0f5fc authored by Achilleas Pipinellis's avatar Achilleas Pipinellis
Browse files

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: default avatarAchilleas Pipinellis <axil@gitlab.com>
Approved-by: default avatarAchilleas Pipinellis <axil@gitlab.com>
Co-authored-by: default avatarEvan Read <eread@gitlab.com>
parents 9963f6b3 47f906bf
No related branches found
No related tags found
1 merge request!100Upstream Merge of 16.1 CE branching point
......@@ -149,3 +149,4 @@
"YouTrack"
]
code_blocks: false
html_elements: false
......@@ -43,12 +43,12 @@
| Filename | Environment variable | Description |
| ------------------------------------ | ------------------------------------ | ----------- |
| 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. |
| GITALY_SERVER_VERSION | GITALY_SERVER_VERSION | Git reference of the [Gitaly](https://gitlab.com/gitlab-org/gitaly) repository. |
| GITLAB_PAGES_VERSION | GITLAB_PAGES_VERSION | Git reference of the [GitLab Pages](https://gitlab.com/gitlab-org/gitlab-pages) repository.|
| GITLAB_SHELL_VERSION | GITLAB_SHELL_VERSION | Git reference of the [GitLab Shell](https://gitlab.com/gitlab-org/gitlab-shell) repository.|
| 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.|
| GITLAB_KAS_VERSION | GITLAB_KAS_VERSION | Git reference of the [GitLab Kubernetes Agent Server](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent) repository.|
| `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. |
| `GITALY_SERVER_VERSION` | `GITALY_SERVER_VERSION` | Git reference of the [Gitaly](https://gitlab.com/gitlab-org/gitaly) repository. |
| `GITLAB_PAGES_VERSION` | `GITLAB_PAGES_VERSION` | Git reference of the [GitLab Pages](https://gitlab.com/gitlab-org/gitlab-pages) repository.|
| `GITLAB_SHELL_VERSION` | `GITLAB_SHELL_VERSION` | Git reference of the [GitLab Shell](https://gitlab.com/gitlab-org/gitlab-shell) repository.|
| `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.|
| `GITLAB_KAS_VERSION` | `GITLAB_KAS_VERSION` | Git reference of the [GitLab Kubernetes Agent Server](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent) repository.|
If you are running the `e2e:package-and-test` job from a GitLab MR, the `GITLAB_VERSION`
environment variable is set to the commit SHA corresponding to the pipeline.
......@@ -107,13 +107,13 @@
| Environment variable | Description |
| --------------------------------------------- | ----------- |
| ALTERNATIVE_PRIVATE_TOKEN | An access token used if needing to pull from private repositories. |
| GITLAB_ALTERNATIVE_REPO | Git repository location for the GitLab Rails application. |
| GITLAB_SHELL_ALTERNATIVE_REPO | Git repository location for [GitLab Shell](https://gitlab.com/gitlab-org/gitlab-shell). |
| GITLAB_PAGES_ALTERNATIVE_REPO | Git repository location for [GitLab Pages](https://gitlab.com/gitlab-org/gitlab-pages). |
| GITALY_SERVER_ALTERNATIVE_REPO | Git repository location for [Gitaly](https://gitlab.com/gitlab-org/gitaly). |
| GITLAB_ELASTICSEARCH_INDEXER_ALTERNATIVE_REPO | Git repository location for [GitLab Elasticsearch Indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer). |
| GITLAB_KAS_ALTERNATIVE_REPO | Git repository location for [GitLab Kubernetes Agent Server](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent). |
| `ALTERNATIVE_PRIVATE_TOKEN` | An access token used if needing to pull from private repositories. |
| `GITLAB_ALTERNATIVE_REPO` | Git repository location for the GitLab Rails application. |
| `GITLAB_SHELL_ALTERNATIVE_REPO` | Git repository location for [GitLab Shell](https://gitlab.com/gitlab-org/gitlab-shell). |
| `GITLAB_PAGES_ALTERNATIVE_REPO` | Git repository location for [GitLab Pages](https://gitlab.com/gitlab-org/gitlab-pages). |
| `GITALY_SERVER_ALTERNATIVE_REPO` | Git repository location for [Gitaly](https://gitlab.com/gitlab-org/gitaly). |
| `GITLAB_ELASTICSEARCH_INDEXER_ALTERNATIVE_REPO` | Git repository location for [GitLab Elasticsearch Indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer). |
| `GITLAB_KAS_ALTERNATIVE_REPO` | Git repository location for [GitLab Kubernetes Agent Server](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent). |
## Build packages for other operating systems
......
This diff is collapsed.
......@@ -10,7 +10,7 @@
There are two main functions you will use to add commands (<https://github.com/chef/omnibus-ctl>):
## add_command_under_category(string, string, string, int, ruby_block)
## `add_command_under_category(string, string, string, int, ruby_block)`
This method will add a new command to your `gitlab-ctl` under a category, useful for grouping similar commands together logically in help output.
......@@ -22,7 +22,7 @@
1. Arity. Always set to `2`, due to [a bug in `omnibus-ctl`](https://github.com/chef/omnibus-ctl#add_command_under_categorystring-string-string-int-ruby_block).
1. Ruby block. Ruby code to be executed when your command is run (arguments to that command will be passed into the block).
## add_command(string, string, int, ruby_block)
## `add_command(string, string, int, ruby_block)`
This method will add a new command to your `gitlab-ctl` without a category. It will be displayed above all categories when the help command is called.
......
......@@ -54,7 +54,7 @@
1. All remotes of the project will be synced.
1. The versions of components will be read from GitLab CE/EE repository
(eg. VERSION, GITLAB_SHELL_VERSION) and written to the Omnibus GitLab repository.
(eg. `VERSION`, `GITLAB_SHELL_VERSION`) and written to the Omnibus GitLab repository.
1. A specific Git tag will be created and synced to Omnibus GitLab repositories.
When the Omnibus GitLab repository on <https://dev.gitlab.org/> gets updated, GitLab CI
......
......@@ -574,7 +574,7 @@
Then run `sudo service nginx reload`.
## Enabling/Disabling nginx_status
## Enabling/Disabling `nginx_status`
By default you will have an NGINX health-check endpoint configured at `127.0.0.1:8060/nginx_status` to monitor your NGINX server status.
......
......@@ -295,7 +295,7 @@
# Perform documentation linting on Markdown files
docs-lint markdown:
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.17-vale-2.24.0-markdownlint-0.33.0-markdownlint2-0.6.0
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.17-vale-2.25.2-markdownlint-0.34.0-markdownlint2-0.7.1
stage: check
cache: {}
needs: []
......@@ -312,7 +312,7 @@
# Perform link checks on published HTML files
docs-lint links:
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.17-ruby-3.2.1-f53af000
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.17-ruby-3.2.2-b8f266e8
stage: check
cache: {}
needs: []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment