mirror of
https://github.com/rancher/os.git
synced 2025-09-04 00:04:25 +00:00
v2.0.0-beta6
- Buildroot 2022.02.8 -- with cherry-picked memory leak fix for dhcpcd - Kernel 5.10.162 - Docker 23.0.0-rc.3 - System-docker 17.06.107 - Removed debugging tool system-docker-containerd-ctr - Build ros binary with Go version 1.19.5 - Improve debug mode by disabling auto reboot and asking resolution
This commit is contained in:
@@ -63,7 +63,7 @@ ARG DISTRIB_ID=BurmillaOS
|
|||||||
|
|
||||||
ARG SELINUX_POLICY_URL=https://github.com/burmilla/refpolicy/releases/download/v0.0.3/policy.29
|
ARG SELINUX_POLICY_URL=https://github.com/burmilla/refpolicy/releases/download/v0.0.3/policy.29
|
||||||
|
|
||||||
ARG KERNEL_VERSION=5.10.129-burmilla
|
ARG KERNEL_VERSION=5.10.162-burmilla
|
||||||
ARG KERNEL_URL_amd64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-x86.tar.gz
|
ARG KERNEL_URL_amd64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-x86.tar.gz
|
||||||
ARG KERNEL_URL_arm64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-arm64.tar.gz
|
ARG KERNEL_URL_arm64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-arm64.tar.gz
|
||||||
|
|
||||||
@@ -79,17 +79,17 @@ ARG OS_CONSOLE=default
|
|||||||
ARG OS_AUTOFORMAT=false
|
ARG OS_AUTOFORMAT=false
|
||||||
ARG OS_FIRMWARE=true
|
ARG OS_FIRMWARE=true
|
||||||
|
|
||||||
ARG OS_BASE_URL_amd64=https://github.com/burmilla/os-base/releases/download/v2022.02.3-1/os-base_amd64.tar.xz
|
ARG OS_BASE_URL_amd64=https://github.com/burmilla/os-base/releases/download/v2022.02.8-2/os-base_amd64.tar.xz
|
||||||
ARG OS_BASE_URL_arm64=https://github.com/burmilla/os-base/releases/download/v2022.02.3-1/os-base_arm64.tar.xz
|
ARG OS_BASE_URL_arm64=https://github.com/burmilla/os-base/releases/download/v2022.02.8-2/os-base_arm64.tar.xz
|
||||||
|
|
||||||
ARG OS_INITRD_BASE_URL_amd64=https://github.com/burmilla/os-initrd-base/releases/download/v2022.02.3-1/os-initrd-base-amd64.tar.gz
|
ARG OS_INITRD_BASE_URL_amd64=https://github.com/burmilla/os-initrd-base/releases/download/v2022.02.8-2/os-initrd-base-amd64.tar.gz
|
||||||
ARG OS_INITRD_BASE_URL_arm64=https://github.com/burmilla/os-initrd-base/releases/download/v2022.02.3-1/os-initrd-base-arm64.tar.gz
|
ARG OS_INITRD_BASE_URL_arm64=https://github.com/burmilla/os-initrd-base/releases/download/v2022.02.8-2/os-initrd-base-arm64.tar.gz
|
||||||
|
|
||||||
ARG SYSTEM_DOCKER_VERSION=17.06-ros6
|
ARG SYSTEM_DOCKER_VERSION=17.06.107
|
||||||
ARG SYSTEM_DOCKER_URL_amd64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
|
ARG SYSTEM_DOCKER_URL_amd64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
|
||||||
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
|
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
|
||||||
|
|
||||||
ARG USER_DOCKER_VERSION=22.06.0beta0
|
ARG USER_DOCKER_VERSION=23.0.0rc3
|
||||||
ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}
|
ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}
|
||||||
|
|
||||||
ARG AZURE_SERVICE=false
|
ARG AZURE_SERVICE=false
|
||||||
@@ -109,7 +109,8 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
|
|||||||
DISTRIB_ID=${DISTRIB_ID} \
|
DISTRIB_ID=${DISTRIB_ID} \
|
||||||
DOWNLOADS=/usr/src/downloads \
|
DOWNLOADS=/usr/src/downloads \
|
||||||
GOPATH=/go \
|
GOPATH=/go \
|
||||||
GO_VERSION=1.16.3 \
|
GO_VERSION=1.19.5 \
|
||||||
|
GO111MODULE=off \
|
||||||
GOARCH=$ARCH \
|
GOARCH=$ARCH \
|
||||||
HOSTNAME_DEFAULT=${HOSTNAME_DEFAULT} \
|
HOSTNAME_DEFAULT=${HOSTNAME_DEFAULT} \
|
||||||
IMAGE_NAME=${IMAGE_NAME} \
|
IMAGE_NAME=${IMAGE_NAME} \
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
//go:build linux
|
||||||
// +build linux
|
// +build linux
|
||||||
|
|
||||||
package init
|
package init
|
||||||
|
@@ -51,7 +51,7 @@ func Main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func setupSigterm() {
|
func setupSigterm() {
|
||||||
sigtermChan := make(chan os.Signal)
|
sigtermChan := make(chan os.Signal, 1)
|
||||||
signal.Notify(sigtermChan, syscall.SIGTERM)
|
signal.Notify(sigtermChan, syscall.SIGTERM)
|
||||||
go func() {
|
go func() {
|
||||||
for range sigtermChan {
|
for range sigtermChan {
|
||||||
|
@@ -28,7 +28,7 @@ func TestParseCloudConfig(t *testing.T) {
|
|||||||
}{
|
}{
|
||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
config: " ",
|
config: " ",
|
||||||
entries: []Entry{{entryError, "found character that cannot start any token", 1}},
|
entries: []Entry{{entryError, "found character that cannot start any token", 1}},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@@ -1,4 +1,6 @@
|
|||||||
|
//go:build amd64
|
||||||
// +build amd64
|
// +build amd64
|
||||||
|
|
||||||
// Copyright 2015 CoreOS, Inc.
|
// Copyright 2015 CoreOS, Inc.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
@@ -12,6 +12,7 @@
|
|||||||
// See the License for the specific language governing permissions and
|
// See the License for the specific language governing permissions and
|
||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
|
//go:build !amd64
|
||||||
// +build !amd64
|
// +build !amd64
|
||||||
|
|
||||||
package vmware
|
package vmware
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
//go:build !go1.5
|
||||||
// +build !go1.5
|
// +build !go1.5
|
||||||
|
|
||||||
package network
|
package network
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
//go:build go1.5
|
||||||
// +build go1.5
|
// +build go1.5
|
||||||
|
|
||||||
package network
|
package network
|
||||||
|
@@ -126,7 +126,7 @@ func UnmarshalOrReturnString(value string) (result interface{}) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//splitCmdLine splits on spaces except when a space is within a quoted or bracketed string.
|
// splitCmdLine splits on spaces except when a space is within a quoted or bracketed string.
|
||||||
func splitCmdLine(cmdLine string) []string {
|
func splitCmdLine(cmdLine string) []string {
|
||||||
lastRune := rune(0)
|
lastRune := rune(0)
|
||||||
f := func(c rune) bool {
|
f := func(c rune) bool {
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
//go:build linux
|
||||||
// +build linux
|
// +build linux
|
||||||
|
|
||||||
package one
|
package one
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
//go:build linux
|
||||||
// +build linux
|
// +build linux
|
||||||
|
|
||||||
package selinux
|
package selinux
|
||||||
|
@@ -184,7 +184,8 @@ func innerInit(deferedHook bool) {
|
|||||||
// init.Main can't read /proc/cmdline at start.
|
// init.Main can't read /proc/cmdline at start.
|
||||||
// and then fails due to the network not being up
|
// and then fails due to the network not being up
|
||||||
// TODO: create a "defered SyslogHook that always gets initialised, but if it fails to connect, stores the logs
|
// TODO: create a "defered SyslogHook that always gets initialised, but if it fails to connect, stores the logs
|
||||||
// and retries connecting every time its triggered....
|
//
|
||||||
|
// and retries connecting every time its triggered....
|
||||||
func AddRSyslogHook() {
|
func AddRSyslogHook() {
|
||||||
val := cmdline.GetCmdline("netconsole")
|
val := cmdline.GetCmdline("netconsole")
|
||||||
netconsole := val.(string)
|
netconsole := val.(string)
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
//go:build linux
|
||||||
// +build linux
|
// +build linux
|
||||||
|
|
||||||
package util
|
package util
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
//go:build linux
|
||||||
// +build linux
|
// +build linux
|
||||||
|
|
||||||
package util
|
package util
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
//go:build linux
|
||||||
// +build linux
|
// +build linux
|
||||||
|
|
||||||
package util
|
package util
|
||||||
|
@@ -1 +1 @@
|
|||||||
APPEND rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 console=tty1 console=ttyS0 console=ttyS1 printk.devkmsg=on transparent_hugepage=never scsi_mod.use_blk_mq=1 panic=10 ${APPEND}
|
APPEND rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 console=tty1 console=ttyS0 console=ttyS1 printk.devkmsg=on transparent_hugepage=never scsi_mod.use_blk_mq=1 ${APPEND}
|
||||||
|
@@ -12,14 +12,14 @@ LABEL rancheros-${LABEL}-autologin
|
|||||||
MENU LABEL Autologin on tty1 and ttyS0
|
MENU LABEL Autologin on tty1 and ttyS0
|
||||||
MENU INDENT 2
|
MENU INDENT 2
|
||||||
COM32 cmd.c32
|
COM32 cmd.c32
|
||||||
APPEND rancheros-${LABEL} rancher.autologin=tty1 rancher.autologin=ttyS0
|
APPEND rancheros-${LABEL} panic=10 rancher.autologin=tty1 rancher.autologin=ttyS0
|
||||||
|
|
||||||
LABEL rancheros-${LABEL}-debug
|
LABEL rancheros-${LABEL}-debug
|
||||||
SAY rancheros-${LABEL}-debug: debug BurmillaOS ${VERSION} ${KERNEL_VERSION}
|
SAY rancheros-${LABEL}-debug: debug BurmillaOS ${VERSION} ${KERNEL_VERSION}
|
||||||
MENU LABEL Debug logging
|
MENU LABEL Debug logging
|
||||||
MENU INDENT 2
|
MENU INDENT 2
|
||||||
COM32 cmd.c32
|
COM32 cmd.c32
|
||||||
APPEND rancheros-${LABEL} rancher.debug=true
|
APPEND rancheros-${LABEL} rancher.debug=true vga=ask
|
||||||
|
|
||||||
LABEL rancheros-${LABEL}-debug-autologin
|
LABEL rancheros-${LABEL}-debug-autologin
|
||||||
SAY rancheros-${LABEL}-debug-autolgin: debug and autologin BurmillaOS ${VERSION} ${KERNEL_VERSION}
|
SAY rancheros-${LABEL}-debug-autolgin: debug and autologin BurmillaOS ${VERSION} ${KERNEL_VERSION}
|
||||||
|
@@ -32,6 +32,8 @@ ln -s usr/sbin ${INITRD_DIR}/sbin
|
|||||||
curl -SL ${!SYSTEM_DOCKER_URL} | tar --strip-components=1 -xzvf - -C ${INITRD_DIR}/usr/bin/
|
curl -SL ${!SYSTEM_DOCKER_URL} | tar --strip-components=1 -xzvf - -C ${INITRD_DIR}/usr/bin/
|
||||||
# we have diabled the user-proxy so we get rid of system-docker-proxy
|
# we have diabled the user-proxy so we get rid of system-docker-proxy
|
||||||
rm -f ${INITRD_DIR}/usr/bin/system-docker-proxy
|
rm -f ${INITRD_DIR}/usr/bin/system-docker-proxy
|
||||||
|
# reduce size by removing debugging tool system-docker-containerd-ctr
|
||||||
|
rm -f ${INITRD_DIR}/usr/bin/system-docker-containerd-ctr
|
||||||
|
|
||||||
cat <<HERE > ${INITRD_DIR}/usr/share/ros/os-release
|
cat <<HERE > ${INITRD_DIR}/usr/share/ros/os-release
|
||||||
NAME="BurmillaOS"
|
NAME="BurmillaOS"
|
||||||
|
Reference in New Issue
Block a user