Feature/remove bollard (#2396)

* wip

* remove bollard, add podman feature

* fix error message parsing

* fix subcommand

* fix typo

* use com.docker.network.bridge.name for podman

* fix parse error

* handle podman network interface nuance

* add libyajl2

* use podman repos

* manually add criu

* do not manually require criu

* remove docker images during cleanup stage

* force removal

* increase img size

* Update startos-iso.yaml

* don't remove docker
This commit is contained in:
Aiden McClelland
2023-08-24 19:20:48 -06:00
committed by GitHub
parent d6eaf8d3d9
commit e3786592b2
19 changed files with 400 additions and 273 deletions

View File

@@ -7,8 +7,8 @@ btrfs-progs
ca-certificates
cifs-utils
containerd.io
curl
cryptsetup
curl
docker-ce
docker-ce-cli
docker-compose-plugin
@@ -23,6 +23,7 @@ iotop
iw
jq
libavahi-client3
libyajl2
lm-sensors
lshw
lvm2
@@ -34,6 +35,7 @@ network-manager
nvme-cli
nyx
openssh-server
podman
postgresql
psmisc
qemu-guest-agent

View File

@@ -82,6 +82,7 @@ cat > /etc/docker/daemon.json << EOF
"storage-driver": "overlay2"
}
EOF
podman network create -d bridge --subnet 172.18.0.1/24 --opt com.docker.network.bridge.name=br-start9 start9
mkdir -p /etc/nginx/ssl
# fix to suppress docker warning, fixed in 21.xx release of docker cli: https://github.com/docker/cli/pull/2934

View File

@@ -15,6 +15,8 @@ ENVIRONMENT=$(cat ENVIRONMENT.txt)
GIT_HASH=$(cat GIT_HASH.txt | head -c 7)
DATE=$(date +%Y%m%d)
ROOT_PART_END=7217792
VERSION_FULL="$VERSION-$GIT_HASH"
if [ -n "$ENVIRONMENT" ]; then
@@ -22,7 +24,7 @@ if [ -n "$ENVIRONMENT" ]; then
fi
TARGET_NAME=startos-${VERSION_FULL}-${DATE}_raspberrypi.img
TARGET_SIZE=$[(6817791+1)*512]
TARGET_SIZE=$[($ROOT_PART_END+1)*512]
rm -f $TARGET_NAME
truncate -s $TARGET_SIZE $TARGET_NAME
@@ -43,7 +45,7 @@ truncate -s $TARGET_SIZE $TARGET_NAME
echo p
echo 2
echo 526336
echo 6817791
echo $ROOT_PART_END
echo a
echo 1
echo w