mirror: Do not store signatures on repo mirroring (PROJQUAY-2167) (qu…

…ay#816) Newer versions of skopeo attempt to store signatures locally. This change prevents copying signatures during repo mirroring. (cherry picked from commit 95ec947)
thomasmckay · Jul 29, 2021 · 93e67ed · 93e67ed
1 parent 57b1c47
commit 93e67ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/util/repomirror/skopeomirror.py b/util/repomirror/skopeomirror.py
@@ -40,6 +40,7 @@ def copy(
         args = args + [
             "copy",
             "--all",
+            "--remove-signatures",
             "--src-tls-verify=%s" % src_tls_verify,
             "--dest-tls-verify=%s" % dest_tls_verify,
         ]

diff --git a/workers/repomirrorworker/test/test_repomirrorworker.py b/workers/repomirrorworker/test/test_repomirrorworker.py
@@ -98,6 +98,7 @@ def test_successful_mirror(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=False",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -156,6 +157,7 @@ def test_successful_disabled_sync_now(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -213,6 +215,7 @@ def test_successful_mirror_verbose_logs(run_skopeo_mock, initialized_db, app, mo
                 "--debug",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -277,6 +280,7 @@ def test_rollback(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -292,6 +296,7 @@ def test_rollback(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -307,6 +312,7 @@ def test_rollback(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -388,6 +394,7 @@ def test_mirror_config_server_hostname(run_skopeo_mock, initialized_db, app, mon
                 "--debug",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -452,6 +459,7 @@ def test_quote_params(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -515,6 +523,7 @@ def test_quote_params_password(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",