-
Notifications
You must be signed in to change notification settings - Fork 27
Conversation
Exposes the corresponding options from containers-image-proxy and skopeo Also changes authfile type from String to PathBuf for consistency Helps ostreedev#121 Depends containers/containers-image-proxy-rs#22
@cgwalters are we going to have defaults/a config file for How do I test this with |
|
||
#[structopt(long)] | ||
/// Directory with certificates (*.crt, *.cert, *.key) used to connect to registry | ||
/// Equivalent to `skopeo --cert-dir` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this too long for the help text?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm. I just tried this out and it looks like structopt eats newlines, but does do auto-wrapping. I just tried e.g.:
diff --git a/lib/src/cli.rs b/lib/src/cli.rs
index e6cbaee..9726fcb 100644
--- a/lib/src/cli.rs
+++ b/lib/src/cli.rs
@@ -162,6 +162,7 @@ enum ContainerImageOpts {
},
/// Copy a pulled container image from one repo to another.
+ /// Blah blah. Lorem ipsum foo bar baz. Lorem ipsum foo bar baz. Lorem ipsum foo bar baz. Lorem ipsum foo bar baz.
Copy {
/// Path to the source repository
#[structopt(long)]
And I get:
walters@toolbox /v/s/w/s/g/o/ostree-rs-ext (main)> cargo b; and ./target/debug/ostree-ext-cli container image --help
Compiling ostree-ext v0.5.1 (/var/srv/walters/src/github/ostreedev/ostree-rs-ext/lib)
Compiling ostree-ext-cli v0.1.4 (/var/srv/walters/src/github/ostreedev/ostree-rs-ext/cli)
Finished dev [optimized + debuginfo] target(s) in 6.94s
ostree-ext-cli-container-image 0.5.1
Commands for working with (possibly layered, non-encapsulated) container images
USAGE:
ostree-ext-cli container image <SUBCOMMAND>
FLAGS:
-h, --help Prints help information
-V, --version Prints version information
SUBCOMMANDS:
copy Copy a pulled container image from one repo to another. Blah blah. Lorem ipsum foo bar baz. Lorem
ipsum foo bar baz. Lorem ipsum foo bar baz. Lorem ipsum foo bar baz
deploy Perform initial deployment for a container image
help Prints this message or the help of the given subcommand(s)
list List container images
pull Pull (or update) a container image
walters@toolbox /v/s/w/s/g/o/ostree-rs-ext (main)>
Soo...it should be fine if you just add a period .
at the end of sentences. Or it could be:
/// Directory with certificates (*.crt, *.cert, *.key) used to connect to registry; equivalent to `skopeo --cert-dir`.
or so?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Never added the period but not sure that's important
I think we should. There's some bike-shedding involved for that. My strawman would be supporting files in (Now the kubelet pull secret should really be in |
@lucab there's a crate for systemd-style config right? I vaguely recall something in coreos using it; tried looking in afterburn but didn't see it. |
Yep, the latter should work fine! One trick here I've used is |
OK so to make the CI here green, we need to change our Do you want to do that or OK if I just push the fixups for this? |
It's not important here.
Now that ostreedev/ostree-rs-ext#180 landed. This completes the "ratcheting" we needed to do to land both PRs.
Exposes the corresponding options from containers-image-proxy and
skopeo
Also changes authfile type from String to PathBuf for consistency
Helps #121
Depends containers/containers-image-proxy-rs#22