Skip to content
This repository was archived by the owner on Oct 11, 2023. It is now read-only.

Commit 64b6eed

Browse files
olljanatolljanat
committed
v2.0.0
* 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
1 parent 8a9e14f commit 64b6eed

File tree

14 files changed

+45
-37
lines changed

14 files changed

+45
-37
lines changed

‎Dockerfile.dapper‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox
3939
wget \
4040
xorriso \
4141
xz-utils \
42-
zstd \
4342
telnet
4443

4544
########## Dapper Configuration #####################
@@ -62,7 +61,7 @@ ARG OS_REPO=burmilla
6261
ARG HOSTNAME_DEFAULT=burmilla
6362
ARG DISTRIB_ID=BurmillaOS
6463

65-
ARG KERNEL_VERSION=5.10.188-burmilla
64+
ARG KERNEL_VERSION=5.10.211-burmilla
6665
ARG KERNEL_URL_amd64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-x86.tar.gz
6766
ARG KERNEL_URL_arm64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-arm64.tar.gz
6867

@@ -81,14 +80,14 @@ ARG OS_FIRMWARE=true
8180
ARG OS_BASE_URL_amd64=https://github.com/burmilla/os-base/releases/download/v2023.05-1/os-base_amd64.tar.xz
8281
ARG OS_BASE_URL_arm64=https://github.com/burmilla/os-base/releases/download/v2023.05-1/os-base_arm64.tar.xz
8382

84-
ARG OS_INITRD_BASE_URL_amd64=https://github.com/burmilla/os-initrd-base/releases/download/v2023.05-2/os-initrd-base-amd64.tar.gz
85-
ARG OS_INITRD_BASE_URL_arm64=https://github.com/burmilla/os-initrd-base/releases/download/v2023.05-2/os-initrd-base-arm64.tar.gz
83+
ARG OS_INITRD_BASE_URL_amd64=https://github.com/burmilla/os-initrd-base/releases/download/v2023.02.10-1/os-initrd-base-amd64.tar.gz
84+
ARG OS_INITRD_BASE_URL_arm64=https://github.com/burmilla/os-initrd-base/releases/download/v2023.02.10-1/os-initrd-base-arm64.tar.gz
8685

87-
ARG SYSTEM_DOCKER_VERSION=17.06.109
86+
ARG SYSTEM_DOCKER_VERSION=17.06.107
8887
ARG SYSTEM_DOCKER_URL_amd64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
8988
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
9089

91-
ARG USER_DOCKER_VERSION=24.0.7
90+
ARG USER_DOCKER_VERSION=24.0.9
9291
ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}
9392

9493
ARG AZURE_SERVICE=false

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Please submit any **BurmillaOS** bugs, issues, and feature requests to [burmilla
2626

2727
## License
2828

29-
Copyright (c) 2020 Project Burmilla
29+
Copyright (c) 2020-2024 [BurmillaOS community](https://burmillaos.org)
3030

3131
Copyright (c) 2014-2020 [Rancher Labs, Inc.](http://rancher.com)
3232

‎cmd/control/docker_init.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func dockerInitAction(c *cli.Context) error {
9696
}
9797
}
9898

99-
err = checkZfsBackingFS(cfg.Rancher.Docker.StorageDriver, cfg.Rancher.Docker.Graph)
99+
err = checkZfsBackingFS(cfg.Rancher.Docker.StorageDriver, cfg.Rancher.Docker.DataRoot)
100100
if err != nil {
101101
log.Fatal(err)
102102
}

‎cmd/control/user_docker.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,14 @@ func startDocker(cfg *config.CloudConfig) error {
186186
return err
187187
}
188188

189-
cmd := []string{"system-engine-rc", "exec", "--", info.ID, "env"}
189+
cmd := []string{"system-docker-runc", "exec", "--", info.ID, "env"}
190190
log.Info(dockerCfg.AppendEnv())
191191
cmd = append(cmd, dockerCfg.AppendEnv()...)
192192
cmd = append(cmd, dockerCommand...)
193193
cmd = append(cmd, args...)
194194
log.Infof("Running %v", cmd)
195195

196-
return syscall.Exec("/usr/bin/system-engine-rc", cmd, os.Environ())
196+
return syscall.Exec("/usr/bin/system-docker-runc", cmd, os.Environ())
197197
}
198198

199199
func waitForPid(service string, project *project.Project) (int, error) {

‎cmd/network/network.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,12 @@ func ApplyNetworkConfig(cfg *config.CloudConfig) {
6363
cfg.Rancher.Network.DHCPTimeout = cfg.Rancher.Defaults.Network.DHCPTimeout
6464
}
6565

66+
// Always generate dhcpcd.conf to support NTP and hostname configuration coming from DHCP
67+
generateDhcpcdFiles(cfg)
68+
6669
// In order to handle the STATIC mode in Wi-Fi network, we have to update the dhcpcd.conf file.
6770
// https://wiki.archlinux.org/index.php/dhcpcd#Static_profile
6871
if len(cfg.Rancher.Network.WifiNetworks) > 0 {
69-
generateDhcpcdFiles(cfg)
7072
generateWpaFiles(cfg)
7173
}
7274

‎config/docker_config_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ func TestGenerateEngineOptsString(t *testing.T) {
3939

4040
testContains(t, fmt.Sprint(generateEngineOptsSlice(EngineOpts{
4141
Host: []string{
42-
"unix:///var/run/system-engine.sock",
42+
"unix:///var/run/system-docker.sock",
4343
"unix:///var/run/docker.sock",
4444
},
45-
})), "--host unix:///var/run/system-engine.sock", "--host unix:///var/run/docker.sock")
45+
})), "--host unix:///var/run/system-docker.sock", "--host unix:///var/run/docker.sock")
4646

4747
testContains(t, fmt.Sprint(generateEngineOptsSlice(EngineOpts{
4848
LogOpts: map[string]string{

‎config/schema.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ var schema = `{
132132
"debug": {"type": ["boolean", "null"]},
133133
"exec_root": {"type": "string"},
134134
"group": {"type": "string"},
135-
"graph": {"type": "string"},
135+
"data_root": {"type": "string"},
136136
"host": {"type": "array"},
137137
"live_restore": {"type": ["boolean", "null"]},
138138
"log_driver": {"type": "string"},

‎config/types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ const (
1818
StateDir = "/state"
1919
RosBin = "/usr/bin/ros"
2020
SysInitBin = "/usr/bin/ros-sysinit"
21-
SystemDockerHost = "unix:///var/run/system-engine.sock"
21+
SystemDockerHost = "unix:///var/run/system-docker.sock"
2222
DockerHost = "unix:///var/run/docker.sock"
2323
ImagesPath = "/usr/share/ros"
2424
InitImages = "images-init.tar"
2525
SystemImages = "images-system.tar"
2626
UserImages = "images-user.tar"
2727
Debug = false
28-
SystemDockerBin = "/usr/bin/system-engine"
28+
SystemDockerBin = "/usr/bin/system-dockerd"
2929
DefaultDind = "burmilla/os-dind:17.12.1"
3030

3131
DetachLabel = "io.rancher.os.detach"
@@ -171,7 +171,7 @@ type EngineOpts struct {
171171
Debug *bool `yaml:"debug,omitempty" opt:"debug"`
172172
ExecRoot string `yaml:"exec_root,omitempty" opt:"exec-root"`
173173
Group string `yaml:"group,omitempty" opt:"group"`
174-
Graph string `yaml:"graph,omitempty" opt:"graph"`
174+
DataRoot string `yaml:"data_root,omitempty" opt:"data-root"`
175175
Host []string `yaml:"host,omitempty" opt:"host"`
176176
InsecureRegistry []string `yaml:"insecure_registry" opt:"insecure-registry"`
177177
LiveRestore *bool `yaml:"live_restore,omitempty" opt:"live-restore"`

‎images/02-console/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COPY build/sshd_config.append.tpl /etc/ssh/
44
COPY build/lsb-release /etc/
55

66
RUN apt-get update \
7-
&& apt-get install -y --no-install-recommends fdisk ipset iptables openssh-server rsync locales \
7+
&& apt-get install -y --no-install-recommends fdisk eject ipset iptables openssh-server rsync locales \
88
sudo less curl ca-certificates psmisc htop kmod iproute2 \
99
net-tools bash-completion wget \
1010
nano open-iscsi iputils-ping nvi \

‎os-config.tpl.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ rancher:
7777
bridge: none
7878
storage_driver: overlay2
7979
restart: false
80-
graph: /var/lib/system-docker
80+
data_root: /var/lib/system-docker
8181
group: root
82-
host: ["unix:///var/run/system-engine.sock"]
82+
host: ["unix:///var/run/system-docker.sock"]
8383
userland_proxy: false
8484
console: {{.OS_CONSOLE}}
8585
cloud_init:
@@ -123,7 +123,7 @@ rancher:
123123
volumes:
124124
- /usr/bin/ros:/usr/bin/ros:ro
125125
- /usr/bin/system-docker:/usr/bin/system-docker:ro
126-
- /usr/bin/system-engine-rc:/usr/bin/system-engine-rc:ro
126+
- /usr/bin/system-docker-runc:/usr/bin/system-docker-runc:ro
127127
system-volumes:
128128
image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
129129
command: echo
@@ -342,7 +342,7 @@ rancher:
342342
privileged: true
343343
restart: always
344344
volumes:
345-
- /var/run/system-engine.sock:/var/run/docker.sock
345+
- /var/run/system-docker.sock:/var/run/docker.sock
346346
environment:
347347
DOCKER_API_VERSION: "1.22"
348348
udev-cold:
@@ -401,9 +401,9 @@ rancher:
401401
storage_driver: overlay2
402402
bridge: none
403403
restart: false
404-
graph: /var/lib/system-docker
404+
data_root: /var/lib/system-docker
405405
group: root
406-
host: ["unix:///var/run/system-engine.sock"]
406+
host: ["unix:///var/run/system-docker.sock"]
407407
pid_file: /var/run/system-docker.pid
408408
exec_root: /var/run/system-docker
409409
config_file: /etc/docker/system-docker.json

0 commit comments

Comments
 (0)