diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go
index fd7b50f5b4..6ca78142e7 100644
--- a/cmd/dockerd/daemon.go
+++ b/cmd/dockerd/daemon.go
@@ -142,7 +142,7 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
 		return err
 	}
 
-	if err := system.MkdirAll(cli.Config.ExecRoot, 0700); err != nil {
+	if err := system.MkdirAll(cli.Config.ExecRoot, 0o700); err != nil {
 		return err
 	}
 
diff --git a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
index 44ca7124c6..c0eae46849 100644
--- a/cmd/dockerd/daemon_unix.go
+++ b/cmd/dockerd/daemon_unix.go
@@ -46,7 +46,7 @@ func getDefaultDaemonConfigFile() (string, error) {
 // setDefaultUmask sets the umask to 0022 to avoid problems
 // caused by custom umask
 func setDefaultUmask() error {
-	desiredUmask := 0022
+	desiredUmask := 0o022
 	unix.Umask(desiredUmask)
 	if umask := unix.Umask(desiredUmask); umask != desiredUmask {
 		return errors.Errorf("failed to set umask: expected %#o, got %#o", desiredUmask, umask)
diff --git a/cmd/dockerd/daemon_windows.go b/cmd/dockerd/daemon_windows.go
index 4e16714442..5d584d571b 100644
--- a/cmd/dockerd/daemon_windows.go
+++ b/cmd/dockerd/daemon_windows.go
@@ -6,9 +6,9 @@ import (
 	"os"
 	"time"
 
+	"github.com/containerd/containerd/log"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/pkg/system"
-	"github.com/containerd/containerd/log"
 	"golang.org/x/sys/windows"
 )
 
diff --git a/cmd/dockerd/docker.go b/cmd/dockerd/docker.go
index 5b4d5f5c0f..b2e199f473 100644
--- a/cmd/dockerd/docker.go
+++ b/cmd/dockerd/docker.go
@@ -17,9 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var (
-	honorXDG bool
-)
+var honorXDG bool
 
 func newDaemonCommand() (*cobra.Command, error) {
 	cfg, err := config.New()
diff --git a/cmd/dockerd/docker_windows.go b/cmd/dockerd/docker_windows.go
index 6a2bd0997b..815c036896 100644
--- a/cmd/dockerd/docker_windows.go
+++ b/cmd/dockerd/docker_windows.go
@@ -1,10 +1,11 @@
 package main
 
 import (
-	"github.com/Microsoft/go-winio/pkg/etwlogrus"
-	"github.com/sirupsen/logrus"
 	"io"
 	"path/filepath"
+
+	"github.com/Microsoft/go-winio/pkg/etwlogrus"
+	"github.com/sirupsen/logrus"
 )
 
 func runDaemon(opts *daemonOptions) error {
diff --git a/cmd/dockerd/trap/trap_linux_test.go b/cmd/dockerd/trap/trap_linux_test.go
index 7d52205a79..1160e1f234 100644
--- a/cmd/dockerd/trap/trap_linux_test.go
+++ b/cmd/dockerd/trap/trap_linux_test.go
@@ -26,7 +26,7 @@ func buildTestBinary(t *testing.T, tmpdir string, prefix string) (string, string
 }
 
 func TestTrap(t *testing.T) {
-	var sigmap = []struct {
+	sigmap := []struct {
 		name     string
 		signal   os.Signal
 		multiple bool