# HG changeset patch
# User Robert Marshall <rmarshall@gitlab.com>
# Date 1650077693 0
#      Sat Apr 16 02:54:53 2022 +0000
# Node ID 904d28465d1ba23e0b3e93e7af445f4cf92c5213
# Parent  b720d3bfeb855a718129396fea4e0879611a2af0
Update to use Omnibus Builder 3.2.0

- New version of Omnibus Builder images tagged for 3.2.0
- Use Ruby 2.7.5
- Upgraded ruby_docker to use Debian/Bullseye
- Add AlmaLinux builders
- Add `skopeo` to `ruby_docker` image
- Bump NodeJS to 16.14.2
- Bump yarn to 1.22.18

Changelog: other

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,7 +63,7 @@
   # will use images from that registry and not depend on GitLab.com
   BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
   PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
-  BUILDER_IMAGE_REVISION: "2.15.0"
+  BUILDER_IMAGE_REVISION: "3.2.0"
   # The registry to pull the assets image from
   ASSET_REGISTRY: "${CI_REGISTRY}"
   ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"
diff --git a/config/software/curl.rb b/config/software/curl.rb
--- a/config/software/curl.rb
+++ b/config/software/curl.rb
@@ -63,6 +63,7 @@
     "--without-fish-functions-dir",
     "--disable-mqtt",
     '--without-libssh2',
+    '--without-nghttp2',
     "--with-zlib=#{install_dir}/embedded",
     "--without-ca-path",
     "--without-ca-bundle",