Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

Commit

Permalink
Add $OPTIONS to Fedora CoreOS ExecStart
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexGustafsson committed May 21, 2020
1 parent ca131ee commit 8b8148e
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions libmachine/provision/fedora_coreos.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ func (provisioner *FedoraCoreOSProvisioner) GenerateDockerOptions(dockerPort int
Environment=TMPDIR=/var/tmp
ExecStart=
ExecStart=/usr/bin/dockerd \
--exec-opt native.cgroupdriver=systemd \
--host=unix:///var/run/docker.sock \
--host=tcp://0.0.0.0:{{.DockerPort}} \
--tlsverify \
--tlscacert {{.AuthOptions.CaCertRemotePath}} \
--tlscert {{.AuthOptions.ServerCertRemotePath}} \
--tlskey {{.AuthOptions.ServerKeyRemotePath}}{{ range .EngineOptions.Labels }} \
--label {{.}}{{ end }}{{ range .EngineOptions.InsecureRegistry }} \
--insecure-registry {{.}}{{ end }}{{ range .EngineOptions.RegistryMirror }} \
--registry-mirror {{.}}{{ end }}{{ range .EngineOptions.ArbitraryFlags }} \
--{{.}}{{ end }} \$DOCKER_OPTS \$DOCKER_OPT_BIP \$DOCKER_OPT_MTU \$DOCKER_OPT_IPMASQ
--exec-opt native.cgroupdriver=systemd \
--host=unix:///var/run/docker.sock \
--host=tcp://0.0.0.0:{{.DockerPort}} \
--tlsverify \
--tlscacert {{.AuthOptions.CaCertRemotePath}} \
--tlscert {{.AuthOptions.ServerCertRemotePath}} \
--tlskey {{.AuthOptions.ServerKeyRemotePath}}{{ range .EngineOptions.Labels }} \
--label {{.}}{{ end }}{{ range .EngineOptions.InsecureRegistry }} \
--insecure-registry {{.}}{{ end }}{{ range .EngineOptions.RegistryMirror }} \
--registry-mirror {{.}}{{ end }}{{ range .EngineOptions.ArbitraryFlags }} \
--{{.}}{{ end }} \$OPTIONS \$DOCKER_OPTS \$DOCKER_OPT_BIP \$DOCKER_OPT_MTU \$DOCKER_OPT_IPMASQ
Environment={{range .EngineOptions.Env}}{{ printf "%q" . }} {{end}}
`

Expand Down

0 comments on commit 8b8148e

Please sign in to comment.