Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.3.0 #183

Merged
merged 4 commits into from
Dec 12, 2018
Merged

Release 2.3.0 #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8809c2
Add boot2docker url as a flag to the start command (#179)
febbraro Dec 11, 2018
7171519
added command the goreleaser to it will build
febbraro Dec 11, 2018
24f456a
iptables forwarding (#182)
febbraro Dec 12, 2018
397181f
Merge branch 'master' into develop
febbraro Dec 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ func main() {
app.Commands = []cli.Command{}
app.Commands = append(app.Commands, (&commands.Start{}).Commands()...)
app.Commands = append(app.Commands, (&commands.Stop{}).Commands()...)
app.Commands = append(app.Commands, (&commands.Restart{}).Commands()...)
app.Commands = append(app.Commands, (&commands.Upgrade{}).Commands()...)
app.Commands = append(app.Commands, (&commands.Status{}).Commands()...)
app.Commands = append(app.Commands, (&commands.Config{}).Commands()...)
Expand Down
53 changes: 0 additions & 53 deletions commands/restart.go
View file
Open in desktop

This file was deleted.

12 changes: 8 additions & 4 deletions commands/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ func (cmd *Start) Run(c *cli.Context) error {
cmd.machine.SetEnv()
cmd.out.Info("Docker Machine (%s) Created", cmd.machine.Name)

dns := DNS{cmd.BaseCommand}
dns.StartDNS(cmd.machine, c.String("nameservers")) // nolint: gosec

// NFS mounts are Mac-only.
if util.IsMac() {
cmd.out.Spin("Enabling NFS file sharing...")
Expand Down Expand Up @@ -138,8 +135,15 @@ func (cmd *Start) Run(c *cli.Context) error {
}
cmd.out.Info("/data filesystem is ready")

// Route configuration needs to be finalized after NFS-triggered reboots.
// When the Docker daemon runs inside boot2docker, it disables packet forwarding to containers
// we need to turn this back on.
// Reference: https://github.com/boot2docker/boot2docker/issues/1364
util.Command("docker-machine", "ssh", cmd.machine.Name, "sudo iptables -P FORWARD ACCEPT").Run()

// DNS & Route configuration needs to be finalized after NFS-triggered reboots.
// This rebooting may change key details such as IP Address of the Dev machine.
dns := DNS{cmd.BaseCommand}
dns.StartDNS(cmd.machine, c.String("nameservers")) // nolint: gosec
dns.ConfigureRoutes(cmd.machine)

cmd.out.Verbose("Use docker-machine to interact with your virtual machine.")
Expand Down
5 changes: 4 additions & 1 deletion gometalinter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"Disable": ["errcheck"]
"Disable": ["errcheck"],
"Linters": {
"gosec": { "Command": "gosec -exclude=G104" }
}
}