parent
e9b4541c91
commit
b72bad955a
|
@ -13,6 +13,7 @@ var appDeployCommand = &cli.Command{
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.ForceFlag,
|
internal.ForceFlag,
|
||||||
internal.ChaosFlag,
|
internal.ChaosFlag,
|
||||||
|
internal.NoDomainChecksFlag,
|
||||||
},
|
},
|
||||||
Description: `
|
Description: `
|
||||||
This command deploys a new instance of an app. It does not support changing the
|
This command deploys a new instance of an app. It does not support changing the
|
||||||
|
|
|
@ -24,6 +24,7 @@ var appUpgradeCommand = &cli.Command{
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.ForceFlag,
|
internal.ForceFlag,
|
||||||
internal.ChaosFlag,
|
internal.ChaosFlag,
|
||||||
|
internal.NoDomainChecksFlag,
|
||||||
},
|
},
|
||||||
Description: `
|
Description: `
|
||||||
This command supports upgrading an app. You can use it to choose and roll out a
|
This command supports upgrading an app. You can use it to choose and roll out a
|
||||||
|
|
|
@ -392,6 +392,15 @@ var NewAppNameFlag = &cli.StringFlag{
|
||||||
Destination: &NewAppName,
|
Destination: &NewAppName,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var NoDomainChecks bool
|
||||||
|
var NoDomainChecksFlag = &cli.BoolFlag{
|
||||||
|
Name: "no-domain-checks",
|
||||||
|
Aliases: []string{"nd"},
|
||||||
|
Value: false,
|
||||||
|
Usage: "Disable app domain sanity checks",
|
||||||
|
Destination: &NoDomainChecks,
|
||||||
|
}
|
||||||
|
|
||||||
// SSHFailMsg is a hopefully helpful SSH failure message
|
// SSHFailMsg is a hopefully helpful SSH failure message
|
||||||
var SSHFailMsg = `
|
var SSHFailMsg = `
|
||||||
Woops, Abra is unable to connect to connect to %s.
|
Woops, Abra is unable to connect to connect to %s.
|
||||||
|
|
|
@ -116,14 +116,18 @@ func DeployAction(c *cli.Context) error {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
domainName := app.Env["DOMAIN"]
|
if !NoDomainChecks {
|
||||||
ipv4, err := dns.EnsureIPv4(domainName)
|
domainName := app.Env["DOMAIN"]
|
||||||
if err != nil || ipv4 == "" {
|
ipv4, err := dns.EnsureIPv4(domainName)
|
||||||
logrus.Fatalf("could not find an IP address assigned to %s?", domainName)
|
if err != nil || ipv4 == "" {
|
||||||
}
|
logrus.Fatalf("could not find an IP address assigned to %s?", domainName)
|
||||||
|
}
|
||||||
|
|
||||||
if _, err = dns.EnsureDomainsResolveSameIPv4(domainName, app.Server); err != nil {
|
if _, err = dns.EnsureDomainsResolveSameIPv4(domainName, app.Server); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logrus.Warn("skipping domain checks as requested")
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := stack.RunDeploy(cl, deployOpts, compose, app.Env["TYPE"]); err != nil {
|
if err := stack.RunDeploy(cl, deployOpts, compose, app.Env["TYPE"]); err != nil {
|
||||||
|
|
Loading…
Reference in New Issue