Commit Graph

49 Commits

Author SHA1 Message Date
Stan Hu 38bd8dffec Use bundler to install Omnibus gems
Instead of calling `gem install <x>` many times, let's define the
`Gemfile` and `Gemfile.lock` and run `bundle install`. This ensures
dependencies are pinned and don't quietly move with a new invocation
of `gem install`. There is also a side benefit to using `bundler`: we
can later use the newly-introduced feature to include and verify
checksums (https://github.com/rubygems/rubygems/pull/6374).

`bundler` generally installs everything in the expected gem directory
 that is used by `ruby`, but for gems installed from a Git source,
`bundler` puts those gems in a special `bundler/gems` directory.
We don't use any gems from Git sources now--`gitlab-ruby-shadow`
is now used instead of `ruby-shadow`--there is no issue.

Also, note that if we want to ensure `gitlab-ctl` doesn't try to pull
in gems from GitLab Rails, we could invoke `bundler`, but this is a
slightly riskier change.

Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8368

Changelog: changed
2024-05-06 04:02:46 +00:00
Robert Marshall e45ee6a327 Check correct file for openssl deps updates
- When we changed the way OpenSSL is built to allow OpenSSL 3 testing,
  the deps.io job for checking OpenSSL broke.  This restores OpenSSL 1.x
  version checks.

Related https://gitlab.com/gitlab-org/gitlab/-/issues/341435

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2024-03-14 00:52:32 -04:00
Clemens Beck 6c8a188e43
Update deps io config for chef 18
Configure deps io to update chef components to the latest chef 18
release. Also add the chef-bin version to deps io, as it should
stay in sync with chef-gem.

Relates https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8294
2024-01-26 14:05:13 +01:00
Andrew Patterson 43f66c7347 Tighten match when checking for updated pcre2
Tighten the match pattern for PCRE2 in deps.yml to not include RC tags.
2024-01-11 15:02:40 -07:00
Will Chandler 829e0931e6 Add git-filter-repo
Gitaly is in the process of adding the ability to rewrite repository
history. To do this, we will use `git-filter-repo`, built by a
prominent contributer to the Git project. The script becomes available
as a Git subcommand when it is placed in $PATH.

Install the script to `/opt/gitlab/embedded/bin` via `pip3` and add
patches for all three of its license files.

Changelog: added
2023-12-20 16:33:34 -05:00
Balasankar 'Balu' C dec8f949c7 Merge branch '8285-support-external-consul-2' into 'master'
Support external consul binary

Closes #8332

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7278

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Clemens Beck <cbeck@gitlab.com>
Co-authored-by: Hossein Pursultani <hpursultani@gitlab.com>
2023-12-04 09:03:59 +00:00
Clemens Beck 5424583045 Support external consul binary
Allow users to bring their own consul, that is not bundled by Omnibus.
The binary path can be configured by setting
consul['binary_path'] = '/custom/consul'.

To customize the consul configuration use the known consul flags.

Consul Admin Documentation: https://docs.gitlab.com/ee/administration/consul.html

Changelog: added
2023-12-04 09:03:58 +00:00
Clemens Beck 53d053e8db Remove bundler for deps yml
The bundler pattern had an escaping issue causing an error in deps
pipelines:

```
panic: Pattern not found in file
```

Even with the proper escaped pattern, the bundler replace did not work
as expected (it used the rubygems version instead).

Remove bundler to unblock master/deps io pipelines.

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8335
2023-12-04 09:01:37 +00:00
Clemens Beck ac93a777d6 Revert "Merge branch '8285-support-external-consul' into 'master'"
This reverts merge request !7256
2023-12-01 10:59:53 +00:00
Balasankar 'Balu' C a7aec7e879 Merge branch '8285-support-external-consul' into 'master'
Support external consul binary

Closes #8285

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7256

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Hossein Pursultani <hpursultani@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Hossein Pursultani <hpursultani@gitlab.com>
Reviewed-by: Clemens Beck <cbeck@gitlab.com>
Co-authored-by: Clemens Beck <cbeck@gitlab.com>
Co-authored-by: Hossein Pursultani <hpursultani@gitlab.com>
2023-11-30 09:34:10 +00:00
Clemens Beck 734b156d5b Support external consul binary
Allow users to bring their own consul, that is not bundled by Omnibus.
The binary path can be configured by setting
consul['binary_path'] = '/custom/consul'.

To customize the consul configuration use the known consul flags.

Consul Admin Documentation: https://docs.gitlab.com/ee/administration/consul.html

Changelog: added
2023-11-30 09:34:10 +00:00
Clemens Beck 20f9aad8b5
Update bundler from 2.4.13 to 2.4.22
Adds bundler to deps io to automate future updates.

Changelog: changed
2023-11-20 13:51:15 +01:00
Clemens Beck 0fc5904416 Update section labels to 'core platform'
Changes the enablement section labels to
core platform in support of the recent
name change.

See https://gitlab.com/gitlab-com/www-gitlab-com/-/merge_requests/129180
2023-11-02 18:19:54 +00:00
Clemens Beck 6641fe8a1f Update pcre2 from 10.40 to 10.42
Merge branch 'security-update-pcre2' into 'master'

See merge request gitlab-org/security/omnibus-gitlab!377

Changelog: security
2023-10-31 15:36:00 +00:00
Balasankar 'Balu' C 4d913708be Merge branch 'sh-add-curl-deps-io' into 'master'
Add curl to deps.yml

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7188

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Jason Plum <jplum@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2023-10-12 08:47:00 +00:00
[┐∵]┘GitLab Dependency Bot 693ea195ab Bump consul to version 1.16.2
Changelog: changed
Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2023-10-12 06:47:05 +00:00
Stan Hu ee65df3075
Add curl to deps.yml
https://github.com/dropseed/deps-git/issues/2 was closed a while ago,
so let's use this functionality to update curl automatically.
2023-10-10 23:25:15 -07:00
Clemens Beck 4eaa411601 ExifTool - Infinite loop when parsing BigTIFF files
Merge branch 'security-update-exiftool' into 'master'

See merge request gitlab-org/security/omnibus-gitlab!364

Changelog: security
2023-09-25 13:22:38 +00:00
Robert Marshall 5d8113861d Place deps.io updates into general review queue
- Add deps.io updates into the general review queue so they are
  visible to more hands to help look them over.

Related https://gitlab.com/gitlab-org/distribution/team-tasks/-/issues/1314

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2023-08-08 16:19:28 -04:00
Hossein Pursultani 153fedec52 Drop Grafana and related code from the package
Software configuration and related code and documentation are removed
from the package.

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8092

Changelog: removed
2023-08-01 20:48:58 +00:00
Stan Hu 4da0f1bdf8 Add Redis to deps.yml
Redis releases are fairly stable and often issue security releases.
Make these versions auto-update to pick them up automatically.

Changelog: changed
2023-07-21 05:15:21 +00:00
Stan Hu d98494b965
Add PgBouncer to deps.yml
PgBouncer v1.9.1 fixes a number of bugs:
https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_1_19_1

Automate the updating of this software component.
2023-06-16 20:17:19 -07:00
Robert Marshall efe5724f38 Merge branch 'update-jpeg-turbo-2.1.5' into 'master'
Update libjpeg-turbo/libjpeg-turbo from 2.1.2 to 2.1.5.1

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6937

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Hossein Pursultani <hpursultani@gitlab.com>
Co-authored-by: DJ Mountney <dj@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2023-06-12 21:44:30 +00:00
DJ Mountney 139bcabfaa Bump libjpeg-turbo to version 2.1.5.1
- Updates libjpeg-turbo/libjpeg-turbo from 2.1.2 to 2.1.5.1

Changelog: changed
2023-06-12 21:44:30 +00:00
Clemens Beck 58b668ab26 Bump nginx to 1.24.0
Bump nginx from 1.20.2 to 1.24.0 and
remove now unnecessary patches.

Changelog: changed
2023-06-05 05:39:57 +00:00
Stan Hu 8366c46608
Update RubyGems to v3.4.12
In https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6242,
we dropped support for updating RubyGems in favor of using the version
shipped by Ruby. However, that version may be outdated. For example,
Ruby 3.0.5 ships with RubyGems v3.2.33, but for native gems that ship
with precompiled musl extensions, we need to make sure we use RubyGems
>= 3.3.22 (https://github.com/rubygems/rubygems/pull/5852). This is to
ensure Omnibus GitLab does not install the wrong native extension.

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/408338

Changelog: changed
2023-04-24 14:30:26 -07:00
DJ Mountney 7ae1a7facf
Add prometheus to dependency automation 2023-03-11 11:47:49 -08:00
Ian Baum 94161ec810 Remove ibaum from dependencies.io configuration
* There has not been a need for me to work on these for a while
2023-02-24 23:48:46 +00:00
Stan Hu e653d77e78 Add exporters to deps.yml
- Add node-exporter to deps.io checks
- Add postgres-exporter to deps.io checks
- Add pgbouncer-exporter to deps.io checks
- Add redis-exporter to deps.io checks

Related https://gitlab.com/groups/gitlab-org/-/epics/8843

Changelog: changed
2022-10-12 00:01:26 +00:00
Takuya Noguchi c16b20b5c4 Use rubygems bundled with ruby language
Removes the rubygems software configuration and updates
all dependencies to use the rubygems bundled with the
ruby language.

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6958

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6957

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>

Changelog: other
2022-08-05 21:53:26 +00:00
DJ Mountney d0a4fd39ba Update deps ranges for the chef gems
Ensure we are only trying to patch chef gems with the 17.x line and not
reverting back to the 15.x line.
2022-06-23 20:22:56 +00:00
Robert Marshall 140a9988b9 Change to new devops::systems label
- Change Omnibus GitLab project files to use the new devops::systems
  label instead of devops::enablement

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2022-06-02 21:45:48 -04:00
Sofia Vistas 8becea39c7 Add container registry version bump to deps 2022-06-01 03:23:49 +00:00
Balasankar "Balu" C e7256f0e1c
Add Robert to the deps.io assignee list
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2022-03-28 20:27:10 +05:30
Rémy Coutable 53bdca2694 Replace "feature::maintenance" with "type::maintenance"
- Brings Omnibus GitLab templates and dependency label
  automation up to date with requirements enacted by
  https://gitlab.com/groups/gitlab-org/-/epics/6622
2022-03-01 19:52:03 +00:00
Balasankar "Balu" C 1573645a0d
Limit grafana updates via deps to < 8.0.0
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2021-11-15 11:31:42 +05:30
DJ Mountney 6a2538841a
Updated isn't an option 2021-07-08 10:50:35 -07:00
DJ Mountney 735c2dd4a6 Add changelog trailers to dependencies.io 2021-07-06 03:01:31 +00:00
DJ Mountney e0bb809eaf
Drop unused awesomeprint gem
Changelog: changed
2021-02-19 10:12:02 -08:00
Balasankar "Balu" C 22025bef67
Remove bundler from dependencies.io list
Signed-off-by: Balasankar "Balu" C <balasankarc@autistici.org>
2021-02-18 10:39:45 +05:30
DJ Mountney bcf0644109
Add grafana to deps.io
This can only start the MR and notify us of an update, but not add the
checksums, etc.
2020-11-04 15:28:39 -08:00
Ian Baum 61db4335f9
Allow deps.io to handle a 3.x rubygems installation
* We ugpraded to 3.1.4 as part of ruby 2.7.2 upgrade. The current
  situation attempts to downgrade rubygems to 2.7.10. Which we don't
want
2020-10-29 16:52:54 -05:00
DJ Mountney eb538eaf25
Update the chef dependnecies in the packages
Updates ohai and mixlib-log to match what we use in our spec testing,
and what is default for the included chef version
2020-06-26 12:04:46 -07:00
DJ Mountney ce0e216619 Add libtiff license as accepted
The libtiff license is BSD-3-clause compatible, but written with more
MIT style language choice.
2020-05-26 11:53:35 +00:00
DJ Mountney 9be0c49b41
Add libjpeg-turbo to dependency tracking 2020-03-23 17:05:15 -07:00
DJ Mountney 226ca00984
Add changelog 2020-03-09 13:46:17 -07:00
DJ Mountney a133c8442e
Remove exiftool from our dependencies.io check
It's git repo tagging doesn't differentiate between stable releases and
pre-releases. And it's counting towards our deps changes per month.
2020-01-27 07:15:34 -08:00
DJ Mountney 37ce8651d2
Update the openssl software with upstream changes
- Removes the need for makedepend
- I've removed the fips support, and changed the patch to match our
current version
2019-12-31 15:47:51 -08:00
DJ Mountney 36b6a48b15
Add deps3 config file
Ports all of our git repos to the new syntax
2019-12-04 17:37:55 -08:00