1
0
mirror of https://github.com/rancher/os.git synced 2025-09-09 10:40:30 +00:00
* Downgrade system-docker to 17.06.107 (last version before rename)
* Use Docker 24.0.9 by default. 25.0.3 available as alternative.
* Buildroot 2023.02.10
* Kernel 5.10.211
* Always generate dhcpd.conf (not only with Wi-Fi)
* Support user Docker "data_root" configuration
This commit is contained in:
Olli Janatuinen
2024-03-05 12:21:58 +00:00
parent 8a9e14f887
commit ab3f7a0b49
14 changed files with 58 additions and 50 deletions

View File

@@ -18,14 +18,14 @@ const (
StateDir = "/state"
RosBin = "/usr/bin/ros"
SysInitBin = "/usr/bin/ros-sysinit"
SystemDockerHost = "unix:///var/run/system-engine.sock"
SystemDockerHost = "unix:///var/run/system-docker.sock"
DockerHost = "unix:///var/run/docker.sock"
ImagesPath = "/usr/share/ros"
InitImages = "images-init.tar"
SystemImages = "images-system.tar"
UserImages = "images-user.tar"
Debug = false
SystemDockerBin = "/usr/bin/system-engine"
SystemDockerBin = "/usr/bin/system-dockerd"
DefaultDind = "burmilla/os-dind:17.12.1"
DetachLabel = "io.rancher.os.detach"
@@ -171,7 +171,7 @@ type EngineOpts struct {
Debug *bool `yaml:"debug,omitempty" opt:"debug"`
ExecRoot string `yaml:"exec_root,omitempty" opt:"exec-root"`
Group string `yaml:"group,omitempty" opt:"group"`
Graph string `yaml:"graph,omitempty" opt:"graph"`
DataRoot string `yaml:"data_root,omitempty" opt:"data-root"`
Host []string `yaml:"host,omitempty" opt:"host"`
InsecureRegistry []string `yaml:"insecure_registry" opt:"insecure-registry"`
LiveRestore *bool `yaml:"live_restore,omitempty" opt:"live-restore"`