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

Commit 615b3d4

Browse files
olljanatolljanat
committed
v2.0.0-rc1
* Load apparmor on boot also when booting from disk * Rename system-dockerd to system-engine * Do not cache service metadatas * Do not cache Docker image to ISO file * Disable system-docker bridge by default * Remove deprecated --oom-score-adjust flag * Update VMware tools to 12.2.5 * Update QEMU guest agent to 7.2 * Remove broken VirtualBox tools
1 parent f87c220 commit 615b3d4

File tree

13 files changed

+20
-33
lines changed

13 files changed

+20
-33
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ __pycache__
2222
.trash-conf
2323
/Dockerfile.dapper*
2424
!/Dockerfile.dapper
25+
scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper*

‎Dockerfile.dapper‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ ARG OS_BASE_URL_arm64=https://github.com/burmilla/os-base/releases/download/v202
8484
ARG OS_INITRD_BASE_URL_amd64=https://github.com/burmilla/os-initrd-base/releases/download/v2023.05-1/os-initrd-base-amd64.tar.gz
8585
ARG OS_INITRD_BASE_URL_arm64=https://github.com/burmilla/os-initrd-base/releases/download/v2023.05-1/os-initrd-base-arm64.tar.gz
8686

87-
ARG SYSTEM_DOCKER_VERSION=17.06.108
87+
ARG SYSTEM_DOCKER_VERSION=17.06.109
8888
ARG SYSTEM_DOCKER_URL_amd64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
8989
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
9090

‎cmd/control/install.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
426426
//cloudConfig := SCRIPTS_DIR + "/conf/empty.yml" //${cloudConfig:-"${SCRIPTS_DIR}/conf/empty.yml"}
427427
CONSOLE := "tty0"
428428
baseName := "/mnt/new_img"
429-
kernelArgs := "printk.devkmsg=on rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait transparent_hugepage=never scsi_mod.use_blk_mq=1 panic=10" // console="+CONSOLE
429+
kernelArgs := "printk.devkmsg=on rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait transparent_hugepage=never scsi_mod.use_blk_mq=1 apparmor=1 security=apparmor panic=10" // console="+CONSOLE
430430
if statedir != "" {
431431
kernelArgs = kernelArgs + " rancher.state.directory=" + statedir
432432
}

‎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-docker-runc", "exec", "--", info.ID, "env"}
189+
cmd := []string{"system-engine-rc", "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-docker-runc", cmd, os.Environ())
196+
return syscall.Exec("/usr/bin/system-engine-rc", cmd, os.Environ())
197197
}
198198

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

‎config/docker_config.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ func (d *DockerConfig) FullArgs() []string {
1212
args = append(args, generateEngineOptsSlice(d.EngineOpts)...)
1313
args = append(args, d.ExtraArgs...)
1414

15-
// Make sure that OOM killer will kill containers before user docker
16-
// https://github.com/burmilla/os/issues/33
17-
args = append(args, "--oom-score-adjust")
18-
args = append(args, "-250")
19-
2015
if d.TLS {
2116
args = append(args, d.TLSArgs...)
2217
}

‎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-docker.sock",
42+
"unix:///var/run/system-engine.sock",
4343
"unix:///var/run/docker.sock",
4444
},
45-
})), "--host unix:///var/run/system-docker.sock", "--host unix:///var/run/docker.sock")
45+
})), "--host unix:///var/run/system-engine.sock", "--host unix:///var/run/docker.sock")
4646

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

‎config/types.go‎

Lines changed: 2 additions & 2 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-docker.sock"
21+
SystemDockerHost = "unix:///var/run/system-engine.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-dockerd"
28+
SystemDockerBin = "/usr/bin/system-engine"
2929
DefaultDind = "burmilla/os-dind:17.12.1"
3030

3131
DetachLabel = "io.rancher.os.detach"

‎os-config.tpl.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ rancher:
7979
restart: false
8080
graph: /var/lib/system-docker
8181
group: root
82-
host: ["unix:///var/run/system-docker.sock"]
82+
host: ["unix:///var/run/system-engine.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-docker-runc:/usr/bin/system-docker-runc:ro
126+
- /usr/bin/system-engine-rc:/usr/bin/system-engine-rc:ro
127127
system-volumes:
128128
image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
129129
command: echo
@@ -341,7 +341,7 @@ rancher:
341341
privileged: true
342342
restart: always
343343
volumes:
344-
- /var/run/system-docker.sock:/var/run/docker.sock
344+
- /var/run/system-engine.sock:/var/run/docker.sock
345345
environment:
346346
DOCKER_API_VERSION: "1.22"
347347
udev-cold:
@@ -398,11 +398,11 @@ rancher:
398398
system_docker:
399399
exec: true
400400
storage_driver: overlay2
401-
bip: 172.18.42.1/16
401+
bridge: none
402402
restart: false
403403
graph: /var/lib/system-docker
404404
group: root
405-
host: ["unix:///var/run/system-docker.sock"]
405+
host: ["unix:///var/run/system-engine.sock"]
406406
pid_file: /var/run/system-docker.pid
407407
exec_root: /var/run/system-docker
408408
config_file: /etc/docker/system-docker.json

‎pkg/init/recovery/recovery.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func Recovery(initFailure error) {
7777
Restart: &[]bool{false}[0],
7878
Graph: "/var/lib/recovery-docker",
7979
Group: "root",
80-
Host: []string{"unix:///var/run/system-docker.sock"},
80+
Host: []string{"unix:///var/run/system-engine.sock"},
8181
UserlandProxy: &[]bool{false}[0],
8282
},
8383
}

‎scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper423‎

Whitespace-only changes.

0 commit comments

Comments
 (0)