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

change prebuild files attribute if exist, in case git clone code doesn't have 'x' permission of it #3053

Open
wants to merge 52 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
872f1cd
Initiate Burmilla OS project
olljanat Nov 14, 2020
6e80223
Fixed issues found from v1.9.0-beta2
olljanat Nov 21, 2020
c25bb67
Disabled banner from SSH and updated boot banner
olljanat Nov 23, 2020
2c8a40b
Make docker-compose command available on console
olljanat Nov 30, 2020
50dcc4b
Release v1.9.0
olljanat Dec 10, 2020
1fb4bcb
Boot banner correction + code cleanup
olljanat Dec 10, 2020
94e85d2
Enable Bash colors
olljanat Dec 13, 2020
d1ffbca
Optimize kernel parameters
olljanat Dec 19, 2020
faffe2e
Allow iscsid.conf modifications
olljanat Dec 19, 2020
4866d88
Use iSCSI settings based on Nutanix guidance
olljanat Dec 19, 2020
bb62c58
Bump libcompose to version with oom_score_adj support
olljanat Dec 19, 2020
b6b68dd
Optimize out of memory handling logic
olljanat Dec 19, 2020
c0e4f7a
Optimize kernel parameters for Redis
olljanat Dec 22, 2020
d9e9511
Optimize kernel parameters for ElasticSearch
olljanat Jan 6, 2021
b31b3fe
v2.0.0-beta3
olljanat Dec 13, 2020
0018ca5
Sync master with v1.9.1 version
olljanat Feb 2, 2021
6fd46dd
Enable pull request validation
olljanat Feb 15, 2021
6cde287
make golang files to pass the latest go lints
h8liu Feb 15, 2021
af08844
Upgrade golang compiler to latest; go fmt files.
h8liu Feb 15, 2021
0c950bd
Support user Docker userns-remap (#63)
olljanat Feb 19, 2021
2ab4b23
Use HOST_ARCH for downloading golang compiler. (#67)
h8liu Mar 24, 2021
791c924
Rename bootfiles to bootloader (#69)
h8liu Mar 26, 2021
91271ef
- Kernel 5.10.28 (5.10.27 for Raspberry Pi) (#79)
olljanat Apr 12, 2021
fe5bdc0
Automatically publish iPXE files (#81)
olljanat Apr 12, 2021
1d57b43
Increase Raspberry boot partition size (#83)
olljanat Apr 12, 2021
9bf4143
Change console back to iptables-legacy (#85)
olljanat Apr 12, 2021
98d7760
Revendor customized from burmilla repos (#89)
olljanat May 1, 2021
f33c848
Added libisl-dev dependency to dapper dockerfile.
rakshasa May 4, 2021
5ee3709
Bump up Golang to 1.16.3
olljanat May 2, 2021
486b29d
Add option to use mirrors of "archive.ubuntu.com" in Dockerfile.dapper.
rakshasa May 5, 2021
4d473e8
Bump up github.com/sirupsen/logrus to 1.8.1 (#90)
olljanat May 9, 2021
0dc7a00
Added nvi to the console image, for those who prefer that.
justledbetter Jun 23, 2021
1b4afa2
Sleep 30 seconds after creating release
olljanat Mar 9, 2022
8ad288b
Kernel 5.10.129, Docker 20.10.13
tredger Jul 19, 2022
8cf3151
dhcpcd: Ignore Docker container interfaces
olljanat Mar 22, 2022
dab432f
Buildroot 2022.02.3. Also fixes #132 in 5.10.x branch
tredger Jul 21, 2022
498c58c
Docker 22.06.0-beta.0
tredger Jul 24, 2022
a9184f2
Removed mips64el support
tredger Jul 25, 2022
c660335
Updated arm64 for Buildroot 2022.02.3 images
tredger Jul 25, 2022
7afcca7
Locked console to Debian bullseye (see #111)
tredger Jul 25, 2022
977771c
rpi kernel to v5.10.110
tredger Jul 25, 2022
4148642
v2.0.0-beta6
olljanat Jan 5, 2023
f87c220
v2.0.0-beta7
olljanat Mar 2, 2023
615b3d4
v2.0.0-rc1
olljanat Aug 14, 2023
8a9e14f
v2.0.0-rc2
olljanat Nov 13, 2023
ab3f7a0
v2.0.0
olljanat Mar 5, 2024
afce4f9
v2.0.1
olljanat Apr 12, 2024
35caf34
v2.0.2-rc1
olljanat Jun 7, 2024
2a0c230
Drop golint which does not work anymore with current Golang versions
olljanat Oct 19, 2024
5d298d5
Use Docker 26.1.4 in builds
olljanat Oct 19, 2024
ed36859
v2.0.2-rc2
olljanat Oct 19, 2024
a9e651a
v2.0.2
olljanat Jan 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
v2.0.0-beta7
- Docker 24.0.5
- Kernel 5.10.188
- System-docker 17.06.108
- System container images compresses with zstd instead of xz
- Added WSL2 support
- Include Hyper-V, ProxmoxVE and VMware tools to ISO
- Include apparmor tools to console
- Enable apparmor by default
- Remove experimental selinux support
- Include chroot command to initrd
olljanat committed Aug 6, 2023
commit f87c220f1b07db6d24966f1bc1f65181b18a376b
44 changes: 0 additions & 44 deletions .github/workflows/add-platform-specific.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
@@ -2,11 +2,6 @@ name: release

on:
workflow_dispatch:
inputs:
firmware:
description: 'Include firmwares'
default: 'true'
required: true

jobs:
build:
21 changes: 8 additions & 13 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox
wget \
xorriso \
xz-utils \
zstd \
telnet

########## Dapper Configuration #####################
@@ -61,9 +62,7 @@ ARG OS_REPO=burmilla
ARG HOSTNAME_DEFAULT=burmilla
ARG DISTRIB_ID=BurmillaOS

ARG SELINUX_POLICY_URL=https://github.com/burmilla/refpolicy/releases/download/v0.0.3/policy.29

ARG KERNEL_VERSION=5.10.162-burmilla
ARG KERNEL_VERSION=5.10.188-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_arm64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-arm64.tar.gz

@@ -79,17 +78,17 @@ ARG OS_CONSOLE=default
ARG OS_AUTOFORMAT=false
ARG OS_FIRMWARE=true

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.8-2/os-base_arm64.tar.xz
ARG OS_BASE_URL_amd64=https://github.com/burmilla/os-base/releases/download/v2023.05-1/os-base_amd64.tar.xz
ARG OS_BASE_URL_arm64=https://github.com/burmilla/os-base/releases/download/v2023.05-1/os-base_arm64.tar.xz

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.8-2/os-initrd-base-arm64.tar.gz
ARG OS_INITRD_BASE_URL_amd64=https://github.com/burmilla/os-initrd-base/releases/download/v2023.05-1/os-initrd-base-amd64.tar.gz
ARG OS_INITRD_BASE_URL_arm64=https://github.com/burmilla/os-initrd-base/releases/download/v2023.05-1/os-initrd-base-arm64.tar.gz

ARG SYSTEM_DOCKER_VERSION=17.06.107
ARG SYSTEM_DOCKER_VERSION=17.06.108
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 USER_DOCKER_VERSION=23.0.0rc3
ARG USER_DOCKER_VERSION=24.0.5
ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}

ARG AZURE_SERVICE=false
@@ -131,7 +130,6 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
OS_AUTOFORMAT=${OS_AUTOFORMAT} \
OS_FIRMWARE=${OS_FIRMWARE} \
REPO_VERSION=master \
SELINUX_POLICY_URL=${SELINUX_POLICY_URL} \
SYSTEM_DOCKER_URL=SYSTEM_DOCKER_URL_${ARCH} \
SYSTEM_DOCKER_URL_amd64=${SYSTEM_DOCKER_URL_amd64} \
SYSTEM_DOCKER_URL_arm64=${SYSTEM_DOCKER_URL_arm64} \
@@ -152,9 +150,6 @@ RUN echo "... Downloading ${!KERNEL_URL}"; \
curl -fL ${!KERNEL_URL} > ${DOWNLOADS}/kernel.tar.gz \
;fi

# Download SELinux Policy
RUN curl -pfL ${SELINUX_POLICY_URL} > ${DOWNLOADS}/$(basename ${SELINUX_POLICY_URL})

# Install Go
RUN curl -L https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${HOST_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
go get github.com/burmilla/trash
2 changes: 0 additions & 2 deletions assets/selinux/config

This file was deleted.

1 change: 0 additions & 1 deletion assets/selinux/ros/contexts/failsafe_context

This file was deleted.

3 changes: 0 additions & 3 deletions assets/selinux/ros/contexts/lxc_contexts

This file was deleted.

1 change: 0 additions & 1 deletion assets/selinux/ros/seusers

This file was deleted.

1 change: 0 additions & 1 deletion cmd/control/cli.go
Original file line number Diff line number Diff line change
@@ -136,7 +136,6 @@ func Main() {
Action: userDockerAction,
},
installCommand,
selinuxCommand(),
}

app.Run(os.Args)
4 changes: 4 additions & 0 deletions cmd/control/console_init.go
Original file line number Diff line number Diff line change
@@ -277,6 +277,10 @@ sudo ros service up docker-compose
log.Error(err)
}

if err := util.RunScript("/etc/init.d/apparmor", "start"); err != nil {
log.Error(err)
}

// Enable Bash colors
enableBashRC("/root", 0, 0)
enableBashRC(rancherHome, 1100, 1100)
59 changes: 0 additions & 59 deletions cmd/control/selinux.go

This file was deleted.

2 changes: 0 additions & 2 deletions cmd/init/init.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@ import (
"github.com/burmilla/os/pkg/init/one"
"github.com/burmilla/os/pkg/init/prepare"
"github.com/burmilla/os/pkg/init/recovery"
"github.com/burmilla/os/pkg/init/selinux"
"github.com/burmilla/os/pkg/init/sharedroot"
"github.com/burmilla/os/pkg/init/switchroot"
"github.com/burmilla/os/pkg/log"
@@ -64,7 +63,6 @@ func RunInit() error {
{Name: "preparefs2", Func: prepare.FS},
{Name: "load modules2", Func: modules.LoadModules},
{Name: "set proxy env", Func: env.Proxy},
{Name: "init SELinux", Func: selinux.Initialize},
{Name: "setupSharedRoot", Func: sharedroot.Setup},
{Name: "sysinit", Func: sysinit.RunSysInit},
}
1 change: 0 additions & 1 deletion config/cloudinit/Documentation/cloud-config.md
Original file line number Diff line number Diff line change
@@ -387,7 +387,6 @@ The following fields are not yet implemented:
- **inactive**: Deactivate the user upon creation
- **lock-passwd**: Boolean. Disable password login for user
- **sudo**: Entry to add to /etc/sudoers for user. By default, no sudo access is authorized.
- **selinux-user**: Corresponding SELinux user
- **ssh-import-id**: Import SSH keys by ID from Launchpad.

```yaml
12 changes: 2 additions & 10 deletions config/docker_config_test.go
Original file line number Diff line number Diff line change
@@ -37,13 +37,6 @@ func TestGenerateEngineOptsString(t *testing.T) {
Bridge: "bridge",
})), "--bridge bridge")

testContains(t, fmt.Sprint(generateEngineOptsSlice(EngineOpts{
SelinuxEnabled: &[]bool{true}[0],
})), "--selinux-enabled")
testContains(t, fmt.Sprint(generateEngineOptsSlice(EngineOpts{
SelinuxEnabled: &[]bool{false}[0],
})), "--selinux-enabled=false")

testContains(t, fmt.Sprint(generateEngineOptsSlice(EngineOpts{
Host: []string{
"unix:///var/run/system-docker.sock",
@@ -59,11 +52,10 @@ func TestGenerateEngineOptsString(t *testing.T) {
})), "--log-opt max-size=25m", "--log-opt max-file=2")

testContains(t, fmt.Sprint(generateEngineOptsSlice(EngineOpts{
Bridge: "bridge",
SelinuxEnabled: &[]bool{true}[0],
Bridge: "bridge",
LogOpts: map[string]string{
"max-size": "25m",
"max-file": "2",
},
})), "--bridge bridge", "--selinux-enabled", "--log-opt max-size=25m", "--log-opt max-file=2")
})), "--bridge bridge", "--log-opt max-size=25m", "--log-opt max-file=2")
}
1 change: 0 additions & 1 deletion config/schema.go
Original file line number Diff line number Diff line change
@@ -140,7 +140,6 @@ var schema = `{
"pid_file": {"type": "string"},
"registry_mirror": {"type": "string"},
"restart": {"type": ["boolean", "null"]},
"selinux_enabled": {"type": ["boolean", "null"]},
"storage_driver": {"type": "string"},
"userland_proxy": {"type": ["boolean", "null"]},
"userns_enabled": {"type": ["boolean", "null"]},
1 change: 0 additions & 1 deletion config/types.go
Original file line number Diff line number Diff line change
@@ -180,7 +180,6 @@ type EngineOpts struct {
PidFile string `yaml:"pid_file,omitempty" opt:"pidfile"`
RegistryMirror string `yaml:"registry_mirror,omitempty" opt:"registry-mirror"`
Restart *bool `yaml:"restart,omitempty" opt:"restart"`
SelinuxEnabled *bool `yaml:"selinux_enabled,omitempty" opt:"selinux-enabled"`
StorageDriver string `yaml:"storage_driver,omitempty" opt:"storage-driver"`
UserlandProxy *bool `yaml:"userland_proxy,omitempty" opt:"userland-proxy"`
}
1 change: 1 addition & 0 deletions images/02-console/Dockerfile
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ RUN apt-get update \
sudo less curl ca-certificates psmisc htop kmod iproute2 \
net-tools bash-completion wget \
nano open-iscsi iputils-ping nvi \
apparmor \
&& update-alternatives --set iptables /usr/sbin/iptables-legacy \
&& update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy \
&& rm -rf /var/lib/apt/lists/* \
1 change: 0 additions & 1 deletion os-config.tpl.yml
Original file line number Diff line number Diff line change
@@ -141,7 +141,6 @@ rancher:
- /etc/logrotate.d:/etc/logrotate.d
- /etc/resolv.conf:/etc/resolv.conf
- /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt.rancher
- /etc/selinux:/etc/selinux
- /lib/firmware:/lib/firmware
- /lib/modules:/lib/modules
- /run:/run
29 changes: 5 additions & 24 deletions pkg/dfs/scratch.go
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ import (
"github.com/burmilla/os/pkg/init/one"
"github.com/burmilla/os/pkg/log"
"github.com/burmilla/os/pkg/netconf"
"github.com/burmilla/os/pkg/selinux"
"github.com/burmilla/os/pkg/util"

"github.com/docker/libnetwork/resolvconf"
@@ -38,9 +37,7 @@ var (
{"none", "/run", "tmpfs", ""},
{"none", "/sys", "sysfs", ""},
{"none", "/sys/fs/cgroup", "tmpfs", ""},
}
optionalMounts = [][]string{
{"none", "/sys/fs/selinux", "selinuxfs", "ro"},
{"debugfs", "/sys/kernel/debug", "debugfs", ""},
}
)

@@ -73,16 +70,6 @@ func createMounts(mounts ...[]string) error {
return nil
}

func createOptionalMounts(mounts ...[]string) {
for _, mount := range mounts {
log.Debugf("Mounting %s %s %s %s", mount[0], mount[1], mount[2], mount[3])
err := util.Mount(mount[0], mount[1], mount[2], mount[3])
if err != nil {
log.Debugf("Unable to mount %s %s %s %s: %v", mount[0], mount[1], mount[2], mount[3], err)
}
}
}

func createDirs(dirs ...string) error {
for _, dir := range dirs {
if _, err := os.Stat(dir); os.IsNotExist(err) {
@@ -448,10 +435,10 @@ func PrepareFs(config *Config) error {
return err
}

createOptionalMounts(optionalMounts...)

if err := mountCgroups(config.CgroupHierarchy); err != nil {
return err
if util.GetHypervisor() != "wsl2" {
if err := mountCgroups(config.CgroupHierarchy); err != nil {
return err
}
}

if err := createLayout(config); err != nil {
@@ -547,8 +534,6 @@ func createLayout(config *Config) error {

cleanupFiles(graphDirectory)

selinux.SetFileContext(graphDirectory, "system_u:object_r:var_lib_t:s0")

symlinks := [][]string{
{"usr/lib", "/lib"},
{"usr/sbin", "/sbin"},
@@ -579,10 +564,6 @@ func firstPrepare() error {

if err := defaultFolders(
"/etc/docker",
"/etc/selinux",
"/etc/selinux/ros",
"/etc/selinux/ros/policy",
"/etc/selinux/ros/contexts",
); err != nil {
return err
}
34 changes: 0 additions & 34 deletions pkg/init/selinux/selinux.go

This file was deleted.

16 changes: 0 additions & 16 deletions pkg/selinux/selinux_linux.go

This file was deleted.

5 changes: 3 additions & 2 deletions pkg/util/cutil.go
Original file line number Diff line number Diff line change
@@ -8,12 +8,13 @@ package util
#include<blkid/blkid.h>
#include<libmount/libmount.h>
#include<stdlib.h>
#cgo pkg-config: libselinux libsepol
#include <selinux/selinux.h>
*/
import "C"
import "unsafe"

import (
"errors"
"unsafe"
)

// ResolveDevice this isn't reliable - blkid -L LABEL works more often :(
12 changes: 11 additions & 1 deletion pkg/util/util_linux.go
Original file line number Diff line number Diff line change
@@ -144,5 +144,15 @@ func BlkidType(deviceType string) (deviceNames []string, err error) {

// GetHypervisor tries to detect if we're running in a VM, and returns a string for its type
func GetHypervisor() string {
return cpuid.CPU.HypervisorName
hv := cpuid.CPU.HypervisorName
if hv == "hyperv" {
data, err := os.ReadFile("/proc/sys/kernel/osrelease")
if err != nil {
return hv
}
if strings.Contains(string(data), "microsoft-standard-WSL2") {
hv = "wsl2"
}
}
return hv
}
2 changes: 1 addition & 1 deletion scripts/global.cfg
Original file line number Diff line number Diff line change
@@ -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 ${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 apparmor=1 security=apparmor ${APPEND}
50 changes: 6 additions & 44 deletions scripts/layout-initrd
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

function cache_services() {
echo "Caching service: $1"
local SERVICE_YMLFILE=$1

local SERVICE_URL=${OS_SERVICES_REPO}/${REPO_VERSION}
@@ -22,10 +23,11 @@ mkdir -p ${INITRD_DIR}/usr/{etc,lib,bin,share/ros}

./scripts/template

cp -rf assets/selinux ${INITRD_DIR}/usr/etc
cp build/images*.tar ${INITRD_DIR}/usr/share/ros/
cp bin/ros ${INITRD_DIR}/usr/bin/
ln -s usr/bin/ros ${INITRD_DIR}/init
# cp ${INITRD_DIR}/usr/bin/sh ${INITRD_DIR}/usr/bin
ln -s ros ${INITRD_DIR}/usr/bin/init
ln -s bin ${INITRD_DIR}/usr/sbin
ln -s usr/sbin ${INITRD_DIR}/sbin

@@ -49,44 +51,9 @@ BUILD_ID=
HERE

# cache os-services yml file
for file in $(find . -type f -name ".make-*"); do
f_file=$(basename ${file})
case $f_file in
".make-vmware")
cache_services "o/open-vm-tools.yml"
;;
".make-4glte")
cache_services "m/modem-manager.yml"
;;
".make-hyperv")
cache_services "h/hyperv-vm-tools.yml"
;;
".make-azurebase")
cache_services "h/hyperv-vm-tools.yml"
cache_services "w/waagent.yml"
;;
".make-proxmoxve")
cache_services "q/qemu-guest-agent.yml"
;;
esac
done
case ${OS_CONSOLE} in
"alpine")
cache_services "a/alpine.yml"
;;
"centos")
cache_services "c/centos.yml"
;;
"debian")
cache_services "d/debian.yml"
;;
"fedora")
cache_services "f/fedora.yml"
;;
"ubuntu")
cache_services "u/ubuntu.yml"
;;
esac
cache_services "h/hyperv-vm-tools.yml"
cache_services "o/open-vm-tools.yml"
cache_services "q/qemu-guest-agent.yml"

pushd ${INITRD_DIR}/usr/etc
ln -s ../share/ros/os-release .
@@ -97,11 +64,6 @@ touch ${INITRD_DIR}/usr/bin/docker-containerd
touch ${INITRD_DIR}/usr/bin/docker-containerd-shim
touch ${INITRD_DIR}/usr/bin/docker

if [ -e ${DOWNLOADS}/policy.29 ]; then
mkdir -p ${INITRD_DIR}/usr/etc/selinux/ros/policy/
cp ${DOWNLOADS}/policy.29 ${INITRD_DIR}/usr/etc/selinux/ros/policy/
fi

# make burmilla/os-initrd image
cat <<HERE > ${INITRD_DIR}/../Dockerfile.initrd
FROM scratch
5 changes: 5 additions & 0 deletions scripts/release-amd64
Original file line number Diff line number Diff line change
@@ -3,6 +3,11 @@ set -ex

cd $(dirname $0)/..

# touch .make-azurebase
touch .make-hyperv
touch .make-proxmoxve
touch .make-vmware

source ./scripts/version
./scripts/release-build

9 changes: 0 additions & 9 deletions scripts/release-azurebase

This file was deleted.

14 changes: 0 additions & 14 deletions scripts/release-hyperv

This file was deleted.

14 changes: 0 additions & 14 deletions scripts/release-proxmoxve

This file was deleted.

14 changes: 0 additions & 14 deletions scripts/release-vmware

This file was deleted.

1 change: 0 additions & 1 deletion scripts/schema.json
Original file line number Diff line number Diff line change
@@ -133,7 +133,6 @@
"pid_file": {"type": "string"},
"registry_mirror": {"type": "string"},
"restart": {"type": ["boolean", "null"]},
"selinux_enabled": {"type": ["boolean", "null"]},
"storage_driver": {"type": "string"},
"userland_proxy": {"type": ["boolean", "null"]},
"userns_enabled": {"type": ["boolean", "null"]},
9 changes: 1 addition & 8 deletions scripts/tar-images
Original file line number Diff line number Diff line change
@@ -44,14 +44,7 @@ echo "tar-image: SYSTEM_IMAGES=$SYSTEM_IMAGES"
echo "tar-image: INIT_IMAGES=$INIT_IMAGES"
echo "tar-image: USER_IMAGES=$USER_IMAGES"

if [ "$COMPRESS" == "" ]; then
ARCHIVE_CMD="gzip"
else
# system-docker can not load images which compressed by xz with a compression level of 9
# decompression consumes more memory if using level 9
# the default compression level for xz is 6
ARCHIVE_CMD="xz -4 -e"
fi
ARCHIVE_CMD="zstd -19 -c"

docker save ${INIT_IMAGES} | ${ARCHIVE_CMD} > ${INIT_IMAGES_DST}
docker save ${SYSTEM_IMAGES} | ${ARCHIVE_CMD} > ${SYSTEM_IMAGES_DST}