Skip to content

Commit

Permalink
Merge pull request #23842 from edsantiago/options-dedup
Browse files Browse the repository at this point in the history
man pages: refactor two more options
  • Loading branch information
openshift-merge-bot[bot] authored Sep 4, 2024
2 parents 958ee48 + d803bb3 commit c449177
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 14 deletions.
7 changes: 7 additions & 0 deletions docs/source/markdown/options/compat-auth-file.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
####> This option file is used in:
####> podman login, logout
####> If file is edited, make sure the changes
####> are applicable to all of those.
#### **--compat-auth-file**=*path*

Instead of updating the default credentials file, update the one at *path*, and use a Docker-compatible format.
8 changes: 8 additions & 0 deletions docs/source/markdown/options/sign-by-sigstore.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
####> This option file is used in:
####> podman manifest push, push
####> If file is edited, make sure the changes
####> are applicable to all of those.
#### **--sign-by-sigstore**=*param-file*

Add a sigstore signature based on further options specified in a container's sigstore signing parameter file *param-file*.
See containers-sigstore-signing-params.yaml(5) for details about the file format.
4 changes: 1 addition & 3 deletions docs/source/markdown/podman-login.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ For more details about format and configurations of the auth.json file, see cont

@@option cert-dir

#### **--compat-auth-file**=*path*

Instead of updating the default credentials file, update the one at *path*, and use a Docker-compatible format.
@@option compat-auth-file

#### **--get-login**

Expand Down
4 changes: 1 addition & 3 deletions docs/source/markdown/podman-logout.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ Remove the cached credentials for all registries in the auth file

@@option authfile

#### **--compat-auth-file**=*path*

Instead of updating the default credentials file, update the one at *path*, and use a Docker-compatible format.
@@option compat-auth-file

#### **--help**, **-h**

Expand Down
5 changes: 1 addition & 4 deletions docs/source/markdown/podman-manifest-push.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,7 @@ Delete the manifest list or image index from local storage if pushing succeeds.

Sign the pushed images with a “simple signing” signature using the specified key. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)

#### **--sign-by-sigstore**=*param-file*

Add a sigstore signature based on further options specified in a container's sigstore signing parameter file *param-file*.
See containers-sigstore-signing-params.yaml(5) for details about the file format.
@@option sign-by-sigstore

#### **--sign-by-sigstore-private-key**=*path*

Expand Down
5 changes: 1 addition & 4 deletions docs/source/markdown/podman-push.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,7 @@ Discard any pre-existing signatures in the image.

Add a “simple signing” signature at the destination using the specified key. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)

#### **--sign-by-sigstore**=*param-file*

Add a sigstore signature based on further options specified in a container's sigstore signing parameter file *param-file*.
See containers-sigstore-signing-params.yaml(5) for details about the file format.
@@option sign-by-sigstore

#### **--sign-by-sigstore-private-key**=*path*

Expand Down

1 comment on commit c449177

@packit-as-a-service
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

podman-next COPR build failed. @containers/packit-build please check.

Please sign in to comment.