From 6efa99b7386b4537f12691b0dba9c9430158e5ee Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 11 Feb 2019 19:31:52 -0500 Subject: [PATCH] Default to registry-use-local Fixes #202 During rpDeploy the Docker image is pushed locally, so registry-use-local should be enabled by default. --- .../com/lightbend/rp/reactivecli/argparse/CommandArgs.scala | 2 +- .../com/lightbend/rp/reactivecli/argparse/InputArgs.scala | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/argparse/CommandArgs.scala b/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/argparse/CommandArgs.scala index 6fa04417..2fddca2b 100644 --- a/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/argparse/CommandArgs.scala +++ b/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/argparse/CommandArgs.scala @@ -29,7 +29,7 @@ object VersionArgs extends CommandArgs object GenerateDeploymentArgs { val DockerRegistryUseHttpsDefault = true val DockerRegistryValidateTlsDefault = true - val DockerRegistryUseLocalDefault = false + val DockerRegistryUseLocalDefault = true /** * Convenience method to set the [[GenerateDeploymentArgs]] values when parsing the complete user input. diff --git a/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/argparse/InputArgs.scala b/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/argparse/InputArgs.scala index a19b538d..02b4676d 100644 --- a/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/argparse/InputArgs.scala +++ b/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/argparse/InputArgs.scala @@ -309,6 +309,11 @@ object InputArgs { .optional() .action(GenerateDeploymentArgs.set((_, c) => c.copy(registryUseLocal = true))), + opt[Unit]("registry-disable-local") /* note: this argument will apply for other targets */ + .text("Disables the local docker registry before the remote registry.") + .optional() + .action(GenerateDeploymentArgs.set((_, c) => c.copy(registryUseLocal = false))), + opt[String]("service-api-version") .text(s"Sets the Service API version. Default: ${printFuture(KubernetesArgs.DefaultServiceApiVersion)}") .optional()