Skip to content

Commit 47586dc

Browse files
committed
Removes storage-driver directive from iso and docker runtime code
The code for the docker runtime (*Docker).setCGroup used to configure the storage driver as well.. which could be seen as a wrong behaviour. Also we're removing the storage-driver directive from the daemon.json that are baked inside the iso.. However we want to see it.. it is not optimal to bake a config inside the iso used by the vm driver; to build a new iso is painful
1 parent d2b65bf commit 47586dc

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/daemon.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
"log-driver": "json-file",
66
"log-opts": {
77
"max-size": "100m"
8-
},
9-
"storage-driver": "overlay2"
8+
}
109
}

deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/daemon.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
"log-driver": "json-file",
66
"log-opts": {
77
"max-size": "100m"
8-
},
9-
"storage-driver": "overlay2"
8+
}
109
}

pkg/minikube/cruntime/docker.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,7 @@ func (r *Docker) setCGroup(driver string) error {
541541
"log-driver": "json-file",
542542
"log-opts": {
543543
"max-size": "100m"
544-
},
545-
"storage-driver": "overlay2"
544+
}
546545
}
547546
`, driver)
548547
ma := assets.NewMemoryAsset([]byte(daemonConfig), "/etc/docker", "daemon.json", "0644")

0 commit comments

Comments
 (0)