@@ -58,21 +58,30 @@ func (provisioner *FedoraCoreOSProvisioner) GenerateDockerOptions(dockerPort int
58
58
driverNameLabel := fmt .Sprintf ("provider=%s" , provisioner .Driver .DriverName ())
59
59
provisioner .EngineOptions .Labels = append (provisioner .EngineOptions .Labels , driverNameLabel )
60
60
61
+ // Adds defaults used by Fedora CoreOS in /etc/systemd/system/docker.service
62
+ // as well as in /etc/sysconfig/docker.
63
+ // The only removed options are:
64
+ // --live-restore option which is incompatible with swarm mode
65
+ // --userland-proxy-path which disables networking to function as expected
61
66
engineConfigTmpl := `[Service]
62
67
Environment=TMPDIR=/var/tmp
63
68
ExecStart=
64
69
ExecStart=/usr/bin/dockerd \
65
- --exec-opt native.cgroupdriver=systemd \
66
- --host=unix:///var/run/docker.sock \
67
- --host=tcp://0.0.0.0:{{.DockerPort}} \
68
- --tlsverify \
69
- --tlscacert {{.AuthOptions.CaCertRemotePath}} \
70
- --tlscert {{.AuthOptions.ServerCertRemotePath}} \
71
- --tlskey {{.AuthOptions.ServerKeyRemotePath}}{{ range .EngineOptions.Labels }} \
72
- --label {{.}}{{ end }}{{ range .EngineOptions.InsecureRegistry }} \
73
- --insecure-registry {{.}}{{ end }}{{ range .EngineOptions.RegistryMirror }} \
74
- --registry-mirror {{.}}{{ end }}{{ range .EngineOptions.ArbitraryFlags }} \
75
- --{{.}}{{ end }} \$DOCKER_OPTS \$DOCKER_OPT_BIP \$DOCKER_OPT_MTU \$DOCKER_OPT_IPMASQ
70
+ --selinux-enabled \
71
+ --log-driver=journald \
72
+ --default-ulimit nofile=1024:1024 \
73
+ --init-path /usr/libexec/docker/docker-init \
74
+ --exec-opt native.cgroupdriver=systemd \
75
+ --host=unix:///var/run/docker.sock \
76
+ --host=tcp://0.0.0.0:{{.DockerPort}} \
77
+ --tlsverify \
78
+ --tlscacert {{.AuthOptions.CaCertRemotePath}} \
79
+ --tlscert {{.AuthOptions.ServerCertRemotePath}} \
80
+ --tlskey {{.AuthOptions.ServerKeyRemotePath}}{{ range .EngineOptions.Labels }} \
81
+ --label {{.}}{{ end }}{{ range .EngineOptions.InsecureRegistry }} \
82
+ --insecure-registry {{.}}{{ end }}{{ range .EngineOptions.RegistryMirror }} \
83
+ --registry-mirror {{.}}{{ end }}{{ range .EngineOptions.ArbitraryFlags }} \
84
+ --{{.}}{{ end }} \$DOCKER_OPTS \$DOCKER_OPT_BIP \$DOCKER_OPT_MTU \$DOCKER_OPT_IPMASQ
76
85
Environment={{range .EngineOptions.Env}}{{ printf "%q" . }} {{end}}
77
86
`
78
87
0 commit comments