NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 18:12:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix www-gitlab-com image with rsync patch

Browse source 
gsutil updated the rsync class in
https://github.com/GoogleCloudPlatform/gsutil/pull/1642. This patch
ports https://github.com/GoogleCloudPlatform/gsutil/pull/1430 to the
latest version. We should eventually remove this patch and solve the
issue via
https://gitlab.com/gitlab-com/marketing/digital-experience/buyer-experience/-/issues/291.
This commit is contained in:
Stan Hu 2023-01-18 21:14:50 -08:00
parent 5cc90b8ba2
commit dc4fb0a36a
No known key found for this signature in database
GPG key ID: 8D3931AD39CC7A20
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
patches/gsutil/rsync_gzip.patch
View file

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

2
scripts/install-www-gitlab-com
View file

@ -31,6 +31,8 @@ function build_debian() {
# Patch gsutil to support gzip compression with rsync command: # Patch gsutil to support gzip compression with rsync command:
# https://github.com/GoogleCloudPlatform/gsutil/pull/1430 # 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 if [[ -d "/patches/gsutil" ]]; then
for i in /patches/gsutil/*.patch; do for i in /patches/gsutil/*.patch; do
echo "$i..." echo "$i..."