update micro deps to v2

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

pkg/command/devldap.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-devldap/pkg/command"
 	svcconfig "github.com/owncloud/ocis-devldap/pkg/config"
 	"github.com/owncloud/ocis-devldap/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // DevLDAPCommand is the entrypoint for the devldap command.
-func DevLDAPCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func DevLDAPCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "devldap",
 		Usage:    "Start devldap server",
 		Category: "Extensions",

pkg/command/graph-explorer.go

@@ -3,7 +3,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-graph-explorer/pkg/command"
 	svcconfig "github.com/owncloud/ocis-graph-explorer/pkg/config"
 	"github.com/owncloud/ocis-graph-explorer/pkg/flagset"
@@ -12,8 +12,8 @@ import (
 )
 
 // GraphExplorerCommand is the entry point for the graph command.
-func GraphExplorerCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func GraphExplorerCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "graph-explorer",
 		Usage:    "Start graph explorer",
 		Category: "Extensions",

pkg/command/graph.go

@@ -3,7 +3,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-graph/pkg/command"
 	svcconfig "github.com/owncloud/ocis-graph/pkg/config"
 	"github.com/owncloud/ocis-graph/pkg/flagset"
@@ -12,8 +12,8 @@ import (
 )
 
 // GraphCommand is the entrypoint for the graph command.
-func GraphCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func GraphCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "graph",
 		Usage:    "Start graph server",
 		Category: "Extensions",

pkg/command/health.go

@@ -4,15 +4,15 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/pkg/config"
 	"github.com/owncloud/ocis/pkg/flagset"
 	"github.com/owncloud/ocis/pkg/register"
 )
 
 // Health is the entrypoint for the health command.
-func Health(cfg *config.Config) cli.Command {
-	return cli.Command{
+func Health(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "health",
 		Usage: "Check health status",
 		Flags: flagset.HealthWithConfig(cfg),

pkg/command/hello.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-hello/pkg/command"
 	svcconfig "github.com/owncloud/ocis-hello/pkg/config"
 	"github.com/owncloud/ocis-hello/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // HelloCommand is the entrypoint for the hello command.
-func HelloCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func HelloCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "hello",
 		Usage:    "Start hello server",
 		Category: "Extensions",

pkg/command/konnectd.go

@@ -3,7 +3,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-konnectd/pkg/command"
 	svcconfig "github.com/owncloud/ocis-konnectd/pkg/config"
 	"github.com/owncloud/ocis-konnectd/pkg/flagset"
@@ -12,8 +12,8 @@ import (
 )
 
 // KonnectdCommand is the entrypoint for the konnectd command.
-func KonnectdCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func KonnectdCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "konnectd",
 		Usage:    "Start konnectd server",
 		Category: "Extensions",

pkg/command/ocs.go

@@ -3,7 +3,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-ocs/pkg/command"
 	svcconfig "github.com/owncloud/ocis-ocs/pkg/config"
 	"github.com/owncloud/ocis-ocs/pkg/flagset"
@@ -12,8 +12,8 @@ import (
 )
 
 // OCSCommand is the entrypoint for the ocs command.
-func OCSCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func OCSCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "ocs",
 		Usage:    "Start ocs server",
 		Category: "Extensions",

pkg/command/phoenix.go

@@ -1,26 +1,33 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"strings"
+
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-phoenix/pkg/command"
 	"github.com/owncloud/ocis-phoenix/pkg/flagset"
-	"github.com/owncloud/ocis-pkg/conversions"
 	"github.com/owncloud/ocis/pkg/config"
 	"github.com/owncloud/ocis/pkg/register"
 )
 
 // PhoenixCommand is the entrypoint for the phoenix command.
-func PhoenixCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func PhoenixCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "phoenix",
 		Usage:    "Start phoenix server",
 		Category: "Extensions",
 		Flags:    flagset.ServerWithConfig(cfg.Phoenix),
-		Action: func(c *cli.Context) error {
-			if c.String("web-config-apps") != "" {
-				cfg.Phoenix.Phoenix.Config.Apps = conversions.StringToSliceString(c.String("web-config-apps"), ",")
+		Before: func(c *cli.Context) error {
+			if cfg.HTTP.Root != "/" {
+				cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
 			}
 
+			cfg.Phoenix.Phoenix.Config.Apps = c.StringSlice("web-config-app")
+
+			return nil
+		},
+		Action: func(c *cli.Context) error {
+
 			scfg := configurePhoenix(cfg)
 
 			return cli.HandleAction(

pkg/command/revaauthbasic.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/command"
 	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // RevaAuthBasicCommand is the entrypoint for the reva-auth-basic command.
-func RevaAuthBasicCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func RevaAuthBasicCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "reva-auth-basic",
 		Usage:    "Start reva auth-basic service",
 		Category: "Extensions",

pkg/command/revaauthbearer.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/command"
 	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // RevaAuthBearerCommand is the entrypoint for the reva-auth-bearer command.
-func RevaAuthBearerCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func RevaAuthBearerCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "reva-auth-bearer",
 		Usage:    "Start reva auth-bearer service",
 		Category: "Extensions",

pkg/command/revafrontend.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/command"
 	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // RevaFrontendCommand is the entrypoint for the reva-frontend command.
-func RevaFrontendCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func RevaFrontendCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "reva-frontend",
 		Usage:    "Start reva frontend",
 		Category: "Extensions",

pkg/command/revagateway.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/command"
 	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // RevaGatewayCommand is the entrypoint for the reva-gateway command.
-func RevaGatewayCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func RevaGatewayCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "reva-gateway",
 		Usage:    "Start reva gateway",
 		Category: "Extensions",

pkg/command/revasharing.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/command"
 	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // RevaSharingCommand is the entrypoint for the reva-sharing command.
-func RevaSharingCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func RevaSharingCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "reva-sharing",
 		Usage:    "Start reva sharing service",
 		Category: "Extensions",

pkg/command/revastoragehome.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/command"
 	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // RevaStorageHomeCommand is the entrypoint for the reva-storage-home command.
-func RevaStorageHomeCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func RevaStorageHomeCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "reva-storage-home",
 		Usage:    "Start reva home storage",
 		Category: "Extensions",

pkg/command/revastoragehomedata.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/command"
 	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // RevaStorageHomeDataCommand is the entrypoint for the reva-storage-home-data command.
-func RevaStorageHomeDataCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func RevaStorageHomeDataCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "reva-storage-home-data",
 		Usage:    "Start reva home storage dataprovider",
 		Category: "Extensions",

pkg/command/revastorageoc.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/command"
 	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // RevaStorageOCCommand is the entrypoint for the reva-storage-oc command.
-func RevaStorageOCCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func RevaStorageOCCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "reva-storage-oc",
 		Usage:    "Start reva oc storage",
 		Category: "Extensions",

pkg/command/revastorageocdata.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/command"
 	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // RevaStorageOCDataCommand is the entrypoint for the reva-storage-oc-data command.
-func RevaStorageOCDataCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func RevaStorageOCDataCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "reva-storage-oc-data",
 		Usage:    "Start reva oc storage dataprovider",
 		Category: "Extensions",

pkg/command/revastorageroot.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/command"
 	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // RevaStorageRootCommand is the entrypoint for the reva-storage-root command.
-func RevaStorageRootCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func RevaStorageRootCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "reva-storage-root",
 		Usage:    "Start reva root storage",
 		Category: "Extensions",

pkg/command/revausers.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/command"
 	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
 )
 
 // RevaUsersCommand is the entrypoint for the reva-users command.
-func RevaUsersCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func RevaUsersCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "reva-users",
 		Usage:    "Start reva users service",
 		Category: "Extensions",

pkg/command/root.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/micro/cli"
-	"github.com/owncloud/ocis-pkg/log"
+	"github.com/micro/cli/v2"
+	"github.com/owncloud/ocis-pkg/v2/log"
 	"github.com/owncloud/ocis/pkg/config"
 	"github.com/owncloud/ocis/pkg/flagset"
 	"github.com/owncloud/ocis/pkg/micro/runtime"
@@ -24,7 +24,7 @@ func Execute() error {
 		Usage:    "ownCloud Infinite Scale Stack",
 		Compiled: version.Compiled(),
 
-		Authors: []cli.Author{
+		Authors: []*cli.Author{
 			{
 				Name:  "ownCloud GmbH",
 				Email: "support@owncloud.com",

pkg/command/server.go

@@ -5,8 +5,8 @@ package command
 import (
 	"strings"
 
-	"github.com/micro/cli"
-	"github.com/micro/go-micro/config/cmd"
+	"github.com/micro/cli/v2"
+	"github.com/micro/go-micro/v2/config/cmd"
 	"github.com/owncloud/ocis/pkg/config"
 	"github.com/owncloud/ocis/pkg/flagset"
 	"github.com/owncloud/ocis/pkg/micro/runtime"
@@ -15,8 +15,8 @@ import (
 )
 
 // Server is the entrypoint for the server command.
-func Server(cfg *config.Config) cli.Command {
-	return cli.Command{
+func Server(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "server",
 		Usage:    "Start fullstack server",
 		Category: "Fullstack",

pkg/command/server_simple.go

@@ -5,8 +5,8 @@ package command
 import (
 	"strings"
 
-	"github.com/micro/cli"
-	"github.com/micro/go-micro/config/cmd"
+	"github.com/micro/cli/v2"
+	"github.com/micro/go-micro/v2/config/cmd"
 	"github.com/owncloud/ocis/pkg/config"
 	"github.com/owncloud/ocis/pkg/flagset"
 	"github.com/owncloud/ocis/pkg/micro/runtime"
@@ -28,8 +28,8 @@ var (
 )
 
 // Simple is the entrypoint for the server command. It is the `ocis server` subcommand overloaded with a different set of services
-func Simple(cfg *config.Config) cli.Command {
-	return cli.Command{
+func Simple(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "server",
 		Usage:    "Start fullstack server",
 		Category: "Fullstack",

pkg/command/webdav.go

@@ -3,7 +3,7 @@
 package command
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-webdav/pkg/command"
 	svcconfig "github.com/owncloud/ocis-webdav/pkg/config"
 	"github.com/owncloud/ocis-webdav/pkg/flagset"
@@ -12,8 +12,8 @@ import (
 )
 
 // WebDAVCommand is the entrypoint for the webdav command.
-func WebDAVCommand(cfg *config.Config) cli.Command {
-	return cli.Command{
+func WebDAVCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:     "webdav",
 		Usage:    "Start webdav server",
 		Category: "Extensions",

pkg/flagset/flagset.go

@@ -1,7 +1,7 @@
 package flagset
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/pkg/config"
 )
 
@@ -12,26 +12,28 @@ func RootWithConfig(cfg *config.Config) []cli.Flag {
 			Name:        "config-file",
 			Value:       "",
 			Usage:       "Path to config file",
-			EnvVar:      "OCIS_CONFIG_FILE",
+			EnvVars:     []string{"OCIS_CONFIG_FILE"},
 			Destination: &cfg.File,
 		},
 		&cli.StringFlag{
 			Name:        "log-level",
 			Value:       "info",
 			Usage:       "Set logging level",
-			EnvVar:      "OCIS_LOG_LEVEL",
+			EnvVars:     []string{"OCIS_LOG_LEVEL"},
 			Destination: &cfg.Log.Level,
 		},
-		&cli.BoolTFlag{
+		&cli.BoolFlag{
+			Value:       true,
 			Name:        "log-pretty",
 			Usage:       "Enable pretty logging",
-			EnvVar:      "OCIS_LOG_PRETTY",
+			EnvVars:     []string{"OCIS_LOG_PRETTY"},
 			Destination: &cfg.Log.Pretty,
 		},
-		&cli.BoolTFlag{
+		&cli.BoolFlag{
+			Value:       true,
 			Name:        "log-color",
 			Usage:       "Enable colored logging",
-			EnvVar:      "OCIS_LOG_COLOR",
+			EnvVars:     []string{"OCIS_LOG_COLOR"},
 			Destination: &cfg.Log.Color,
 		},
 	}
@@ -44,7 +46,7 @@ func HealthWithConfig(cfg *config.Config) []cli.Flag {
 			Name:        "debug-addr",
 			Value:       "0.0.0.0:9010",
 			Usage:       "Address to debug endpoint",
-			EnvVar:      "OCIS_DEBUG_ADDR",
+			EnvVars:     []string{"OCIS_DEBUG_ADDR"},
 			Destination: &cfg.Debug.Addr,
 		},
 	}
@@ -56,82 +58,82 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 		&cli.BoolFlag{
 			Name:        "tracing-enabled",
 			Usage:       "Enable sending traces",
-			EnvVar:      "OCIS_TRACING_ENABLED",
+			EnvVars:     []string{"OCIS_TRACING_ENABLED"},
 			Destination: &cfg.Tracing.Enabled,
 		},
 		&cli.StringFlag{
 			Name:        "tracing-type",
 			Value:       "jaeger",
 			Usage:       "Tracing backend type",
-			EnvVar:      "OCIS_TRACING_TYPE",
+			EnvVars:     []string{"OCIS_TRACING_TYPE"},
 			Destination: &cfg.Tracing.Type,
 		},
 		&cli.StringFlag{
 			Name:        "tracing-endpoint",
 			Value:       "",
 			Usage:       "Endpoint for the agent",
-			EnvVar:      "OCIS_TRACING_ENDPOINT",
+			EnvVars:     []string{"OCIS_TRACING_ENDPOINT"},
 			Destination: &cfg.Tracing.Endpoint,
 		},
 		&cli.StringFlag{
 			Name:        "tracing-collector",
 			Value:       "",
 			Usage:       "Endpoint for the collector",
-			EnvVar:      "OCIS_TRACING_COLLECTOR",
+			EnvVars:     []string{"OCIS_TRACING_COLLECTOR"},
 			Destination: &cfg.Tracing.Collector,
 		},
 		&cli.StringFlag{
 			Name:        "tracing-service",
 			Value:       "hello",
 			Usage:       "Service name for tracing",
-			EnvVar:      "OCIS_TRACING_SERVICE",
+			EnvVars:     []string{"OCIS_TRACING_SERVICE"},
 			Destination: &cfg.Tracing.Service,
 		},
 		&cli.StringFlag{
 			Name:        "debug-addr",
 			Value:       "0.0.0.0:9010",
 			Usage:       "Address to bind debug server",
-			EnvVar:      "OCIS_DEBUG_ADDR",
+			EnvVars:     []string{"OCIS_DEBUG_ADDR"},
 			Destination: &cfg.Debug.Addr,
 		},
 		&cli.StringFlag{
 			Name:        "debug-token",
 			Value:       "",
 			Usage:       "Token to grant metrics access",
-			EnvVar:      "OCIS_DEBUG_TOKEN",
+			EnvVars:     []string{"OCIS_DEBUG_TOKEN"},
 			Destination: &cfg.Debug.Token,
 		},
 		&cli.BoolFlag{
 			Name:        "debug-pprof",
 			Usage:       "Enable pprof debugging",
-			EnvVar:      "OCIS_DEBUG_PPROF",
+			EnvVars:     []string{"OCIS_DEBUG_PPROF"},
 			Destination: &cfg.Debug.Pprof,
 		},
 		&cli.BoolFlag{
 			Name:        "debug-zpages",
 			Usage:       "Enable zpages debugging",
-			EnvVar:      "OCIS_DEBUG_ZPAGES",
+			EnvVars:     []string{"OCIS_DEBUG_ZPAGES"},
 			Destination: &cfg.Debug.Zpages,
 		},
 		&cli.StringFlag{
 			Name:        "http-addr",
 			Value:       "0.0.0.0:9000",
 			Usage:       "Address to bind http server",
-			EnvVar:      "OCIS_HTTP_ADDR",
+			EnvVars:     []string{"OCIS_HTTP_ADDR"},
 			Destination: &cfg.HTTP.Addr,
 		},
 		&cli.StringFlag{
 			Name:        "http-root",
 			Value:       "/",
 			Usage:       "Root path of http server",
-			EnvVar:      "OCIS_HTTP_ROOT",
+			EnvVars:     []string{"OCIS_HTTP_ROOT"},
 			Destination: &cfg.HTTP.Root,
 		},
 		&cli.StringFlag{
 			Name:        "grpc-addr",
 			Value:       "0.0.0.0:9001",
 			Usage:       "Address to bind grpc server",
-			EnvVar:      "OCIS_GRPC_ADDR",
+			EnvVars:     []string{"OCIS_GRPC_ADDR"},
 			Destination: &cfg.GRPC.Addr,
 		},
 	}

pkg/micro/runtime/command.go

@@ -1,13 +1,13 @@
 package runtime
 
 import (
-	"github.com/micro/cli"
-	"github.com/micro/go-micro/config/cmd"
-	"github.com/owncloud/ocis-pkg/log"
+	"github.com/micro/cli/v2"
+	"github.com/micro/go-micro/v2/config/cmd"
+	"github.com/owncloud/ocis-pkg/v2/log"
 )
 
 // Command adds micro runtime commands to the cli app
-func Command(app *cli.App) cli.Command {
+func Command(app *cli.App) *cli.Command {
 	command := cli.Command{
 		Name:        "micro",
 		Description: "starts the go-micro runtime services",
@@ -27,5 +27,5 @@ func Command(app *cli.App) cli.Command {
 			return nil
 		},
 	}
-	return command
+	return &command
 }

pkg/micro/runtime/options.go

@@ -1,8 +1,8 @@
 package runtime
 
 import (
-	gorun "github.com/micro/go-micro/runtime"
-	"github.com/owncloud/ocis-pkg/log"
+	gorun "github.com/micro/go-micro/v2/runtime"
+	"github.com/owncloud/ocis-pkg/v2/log"
 )
 
 // Options is a runtime option

pkg/micro/runtime/runtime.go

@@ -5,21 +5,21 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/micro/cli"
-	gorun "github.com/micro/go-micro/runtime"
-	"github.com/micro/micro/api"
-	"github.com/micro/micro/broker"
-	"github.com/micro/micro/health"
-	"github.com/micro/micro/monitor"
-	"github.com/micro/micro/proxy"
-	"github.com/micro/micro/registry"
-	"github.com/micro/micro/router"
-	"github.com/micro/micro/runtime"
-	"github.com/micro/micro/server"
-	"github.com/micro/micro/store"
-	"github.com/micro/micro/tunnel"
-	"github.com/micro/micro/web"
-	"github.com/owncloud/ocis-pkg/log"
+	"github.com/micro/cli/v2"
+	gorun "github.com/micro/go-micro/v2/runtime"
+	"github.com/micro/micro/v2/api"
+	"github.com/micro/micro/v2/broker"
+	"github.com/micro/micro/v2/health"
+	"github.com/micro/micro/v2/monitor"
+	"github.com/micro/micro/v2/proxy"
+	"github.com/micro/micro/v2/registry"
+	"github.com/micro/micro/v2/router"
+	"github.com/micro/micro/v2/runtime"
+	"github.com/micro/micro/v2/server"
+	"github.com/micro/micro/v2/store"
+	"github.com/micro/micro/v2/tunnel"
+	"github.com/micro/micro/v2/web"
+	"github.com/owncloud/ocis-pkg/v2/log"
 )
 
 // OwncloudNamespace is the base path for micro' services to use

pkg/register/command.go

@@ -1,7 +1,7 @@
 package register
 
 import (
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/pkg/config"
 )
 
@@ -11,7 +11,7 @@ var (
 )
 
 // Command defines the register command.
-type Command func(*config.Config) cli.Command
+type Command func(*config.Config) *cli.Command
 
 // AddCommand appends a command to Commands.
 func AddCommand(cmd Command) {

pkg/tracing/tracing.go

@@ -8,7 +8,7 @@ import (
 	"contrib.go.opencensus.io/exporter/zipkin"
 	openzipkin "github.com/openzipkin/zipkin-go"
 	zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
-	"github.com/owncloud/ocis-pkg/log"
+	"github.com/owncloud/ocis-pkg/v2/log"
 	"github.com/owncloud/ocis/pkg/config"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/trace"