Merge branch 'sh-pin-gcloud-version-wwww-gitlab-com' into 'master'

Pin gsutil version in www-gitlab-com image

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/630

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Michael Friedrich <mfriedrich@gitlab.com>

Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16

@@ -1,5 +1,10 @@
-FROM gcr.io/google.com/cloudsdktool/cloud-sdk as gcloud-sdk
+ARG GCLOUD_VERSION=413.0.0
 
+# Google-cloud-sdk
+#
+# gsutil 5.18 unnecessarily requires the storage.buckets.get
+# permission: https://github.com/GoogleCloudPlatform/gsutil/issues/1663
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:$GCLOUD_VERSION as gcloud-sdk
 FROM ruby:3.0.5-slim-bullseye
 
 # Install Google Cloud SDK for deploys via rsync

patches/gsutil/rsync_gzip.patch

@@ -1,11 +1,11 @@
 diff --git a/gslib/commands/rsync.py b/gslib/commands/rsync.py
-index 023df922..d2105e80 100644
+index 734a8dbf0..0897d74a5 100644
 --- a/gslib/commands/rsync.py
 +++ b/gslib/commands/rsync.py
-@@ -543,6 +543,58 @@ _DETAILED_HELP_TEXT = ("""
+@@ -527,6 +527,58 @@
-                  .txt files being included, regardless of whether they appear in
+                  use ^ as an escape character instead of \\ and escape the |
-                  subdirectories that end in .txt.
+                  character. When using Windows PowerShell, use ' instead of "
- 
+                  and surround the | character with ".
 +
 +  -z <ext,...>   Applies gzip content-encoding to any file upload whose
 +                 extension matches the ``-z`` extension list. This is useful when
@@ -61,16 +61,16 @@ index 023df922..d2105e80 100644
  """)
  # pylint: enable=anomalous-backslash-in-string
  
-@@ -1609,7 +1661,7 @@ class RsyncCommand(Command):
+@@ -1580,7 +1632,7 @@ class RsyncCommand(Command):
        usage_synopsis=_SYNOPSIS,
        min_args=2,
        max_args=2,
--      supported_sub_args='a:cCdenpPriRuUx:y:j:J',
+-      supported_sub_args='a:cCdenpPriRuUx:j:J',
-+      supported_sub_args='a:cCdenpPriRuUx:y:z:Zj:J',
++      supported_sub_args='a:cCdenpPriRuUx:z:Zj:J',
        file_url_ok=True,
        provider_url_ok=False,
        urls_start_arg=0,
-@@ -1768,6 +1820,7 @@ class RsyncCommand(Command):
+@@ -1732,6 +1784,7 @@ def _ParseOpts(self):
      # The gzip_encoded flag marks if the files should be compressed during
      # the upload.
      gzip_encoded = False
@@ -78,7 +78,7 @@ index 023df922..d2105e80 100644
      gzip_arg_exts = None
      gzip_arg_all = None
      if self.sub_opts:
-@@ -1817,10 +1870,19 @@ class RsyncCommand(Command):
+@@ -1779,10 +1832,19 @@ def _ParseOpts(self):
              self.exclude_pattern = re.compile(a)
            except re.error:
              raise CommandException('Invalid exclude filter (%s)' % a)

scripts/install-www-gitlab-com

@@ -31,8 +31,6 @@ function build_debian() {
 
     # Patch gsutil to support gzip compression with rsync command:
     # https://github.com/GoogleCloudPlatform/gsutil/pull/1430
-    #
-    # We should deprecate this and solve it via https://gitlab.com/gitlab-com/marketing/digital-experience/buyer-experience/-/issues/291
     if [[ -d "/patches/gsutil" ]]; then
     for i in /patches/gsutil/*.patch; do
         echo "$i..."