Skip to content

Commit e1826c2

Browse files
authored
Merge pull request #63242 from openshift-cherrypick-robot/cherry-pick-62844-to-main
[main] OCPBUG#16746: Modified steps related to local OCI catalogs.
2 parents ac66d3c + f7a83b9 commit e1826c2

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

modules/oc-mirror-command-reference.adoc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ The following tables describe the `oc mirror` subcommands and flags:
6565
|`--ignore-history`
6666
|Ignore past mirrors when downloading images and packing layers. Disables incremental mirroring and might download more data.
6767

68-
|`--include-local-oci-catalogs`
69-
|Enable mirroring for local OCI catalogs on disk to the target mirror registry.
70-
7168
|`--manifests-only`
7269
|Generate manifests for `ImageContentSourcePolicy` objects to configure a cluster to use the mirror registry, but do not actually mirror any images. To use this flag, you must pass in an image set archive with the `--from` flag.
7370

@@ -107,12 +104,7 @@ The following tables describe the `oc mirror` subcommands and flags:
107104
|`--source-use-http`
108105
|Use plain HTTP for the source registry.
109106

110-
|`--use-oci-feature`
111-
|Enable mirroring for local OCI catalogs on disk to the target mirror registry.
112-
113-
The `--use-oci-feature` flag is deprecated. Use the `--include-local-oci-catalogs` flag instead.
114-
115107
|`-v`, `--verbose` `<int>`
116108
|Specify the number for the log level verbosity. Valid values are `0` - `9`. The default is `0`.
117109

118-
|===
110+
|===

modules/oc-mirror-oci-format.adoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,10 @@ mirror:
7373
[source,terminal]
7474
----
7575
$ oc mirror --config=./imageset-config.yaml \ <1>
76-
--include-local-oci-catalogs <2>
77-
docker://registry.example:5000 <3>
76+
docker://registry.example:5000 <2>
7877
----
7978
<1> Pass in the image set configuration file. This procedure assumes that it is named `imageset-config.yaml`.
80-
<2> Use the `--include-local-oci-catalogs` flag to enable mirroring local OCI catalogs along with other remote content.
81-
<3> Specify the registry to mirror the content to. The registry must start with `docker://`. If you specify a top-level namespace for the mirror registry, you must also use this same namespace on subsequent executions.
79+
<2> Specify the registry to mirror the content to. The registry must start with `docker://`. If you specify a top-level namespace for the mirror registry, you must also use this same namespace on subsequent executions.
8280
+
8381
Optionally, you can specify other flags to adjust the behavior of the OCI feature:
8482
+

0 commit comments

Comments
 (0)