docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add env var for default server url 

The default server URL can now be set using the `NOTARY_SERVER_URL`
environment variable. Specifying the `--server` parameter still
override this value.

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
This commit is contained in:
Christophe Labouisse 2015-09-19 17:06:30 +02:00
parent 36594b360c
commit f9508e37e0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/notary/main.go
View File

@ -72,6 +72,11 @@ func parseConfig() {
} }
func main() { func main() {
serverURL := os.Getenv("NOTARY_SERVER_URL")
if serverURL == "" {
serverURL = defaultServerURL
}
var notaryCmd = &cobra.Command{ var notaryCmd = &cobra.Command{
Use: "notary", Use: "notary",
Short: "notary allows the creation of trusted collections.", Short: "notary allows the creation of trusted collections.",
@ -95,19 +100,19 @@ func main() {
notaryCmd.AddCommand(cmdKey) notaryCmd.AddCommand(cmdKey)
notaryCmd.AddCommand(cmdCert) notaryCmd.AddCommand(cmdCert)
notaryCmd.AddCommand(cmdTufInit) notaryCmd.AddCommand(cmdTufInit)
cmdTufInit.Flags().StringVarP(&remoteTrustServer, "server", "s", defaultServerURL, "Remote trust server location") cmdTufInit.Flags().StringVarP(&remoteTrustServer, "server", "s", serverURL, "Remote trust server location")
notaryCmd.AddCommand(cmdTufList) notaryCmd.AddCommand(cmdTufList)
cmdTufList.Flags().BoolVarP(&rawOutput, "raw", "", false, "Instructs notary list to output a nonpretty printed version of the targets list. Useful if you need to parse the list.") cmdTufList.Flags().BoolVarP(&rawOutput, "raw", "", false, "Instructs notary list to output a nonpretty printed version of the targets list. Useful if you need to parse the list.")
cmdTufList.Flags().StringVarP(&remoteTrustServer, "server", "s", defaultServerURL, "Remote trust server location") cmdTufList.Flags().StringVarP(&remoteTrustServer, "server", "s", serverURL, "Remote trust server location")
notaryCmd.AddCommand(cmdTufAdd) notaryCmd.AddCommand(cmdTufAdd)
notaryCmd.AddCommand(cmdTufRemove) notaryCmd.AddCommand(cmdTufRemove)
notaryCmd.AddCommand(cmdTufPublish) notaryCmd.AddCommand(cmdTufPublish)
cmdTufPublish.Flags().StringVarP(&remoteTrustServer, "server", "s", defaultServerURL, "Remote trust server location") cmdTufPublish.Flags().StringVarP(&remoteTrustServer, "server", "s", serverURL, "Remote trust server location")
notaryCmd.AddCommand(cmdTufLookup) notaryCmd.AddCommand(cmdTufLookup)
cmdTufLookup.Flags().BoolVarP(&rawOutput, "raw", "", false, "Instructs notary lookup to output a nonpretty printed version of the targets list. Useful if you need to parse the list.") cmdTufLookup.Flags().BoolVarP(&rawOutput, "raw", "", false, "Instructs notary lookup to output a nonpretty printed version of the targets list. Useful if you need to parse the list.")
cmdTufLookup.Flags().StringVarP(&remoteTrustServer, "server", "s", defaultServerURL, "Remote trust server location") cmdTufLookup.Flags().StringVarP(&remoteTrustServer, "server", "s", serverURL, "Remote trust server location")
notaryCmd.AddCommand(cmdVerify) notaryCmd.AddCommand(cmdVerify)
cmdVerify.Flags().StringVarP(&remoteTrustServer, "server", "s", defaultServerURL, "Remote trust server location") cmdVerify.Flags().StringVarP(&remoteTrustServer, "server", "s", serverURL, "Remote trust server location")
notaryCmd.Execute() notaryCmd.Execute()
} }