diff --git a/changelog/unreleased/ocis_config_file_option.md b/changelog/unreleased/ocis_config_file_option.md new file mode 100644 index 000000000..559319f10 --- /dev/null +++ b/changelog/unreleased/ocis_config_file_option.md @@ -0,0 +1,3 @@ +Bugfix: Remove unimplemented config file option for oCIS root command + +https://github.com/owncloud/ocis/pull/1636 diff --git a/ocis/pkg/config/config.go b/ocis/pkg/config/config.go index ca7d907ae..6de2403d7 100644 --- a/ocis/pkg/config/config.go +++ b/ocis/pkg/config/config.go @@ -61,7 +61,6 @@ type TokenManager struct { // Config combines all available configuration parts. type Config struct { - File string Registry string Log Log Debug Debug diff --git a/ocis/pkg/flagset/flagset.go b/ocis/pkg/flagset/flagset.go index 8daa92c78..554850ab5 100644 --- a/ocis/pkg/flagset/flagset.go +++ b/ocis/pkg/flagset/flagset.go @@ -8,13 +8,6 @@ import ( // RootWithConfig applies cfg to the root flagset func RootWithConfig(cfg *config.Config) []cli.Flag { return []cli.Flag{ - &cli.StringFlag{ - Name: "config-file", - Value: "", - Usage: "Path to config file", - EnvVars: []string{"OCIS_CONFIG_FILE"}, - Destination: &cfg.File, - }, &cli.StringFlag{ Name: "log-level", Value: "info",