diff --git a/Containerfile b/Containerfile index c2698de..dde0f83 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora-coreos:stable +FROM quay.io/fedora/fedora-bootc:44 # Install ZFS RUN dnf install -y kernel-devel-$(uname -r | awk -F'-' '{print $1}') @@ -10,3 +10,5 @@ RUN mkdir /backups && chown backup:backup /backups COPY --chown=root:root --chmod=600 id_ed25519.pub /root/.ssh/authorized_keys COPY --chown=backup:backup --chmod=600 id_ed25519.pub /var/home/backup/.ssh/authorized_keys + +RUN bootc container lint diff --git a/commands.sh b/commands.sh index 4b97b1c..1ea8260 100755 --- a/commands.sh +++ b/commands.sh @@ -2,18 +2,18 @@ REPO="gitea.wefers.page/julian/backup-server" TAG="latest" build() { + # ABSOLUTELY DO NOT USE --squash, as ostree NEEDS the layers buildah build \ -t ${REPO}:${TAG} \ --pull \ --layers \ - --squash \ --format oci \ . if [ $? -eq 0 ]; then buildah login gitea.wefers.page -u julian -p 278b81490079574229dce45b66b726d2ae7e83c0 buildah push \ - --compression-format zstd:chunked \ + --compression-format zstd \ "${REPO}:${TAG}" fi diff --git a/kickstart.ks b/kickstart.ks index a8b870d..cc53209 100644 --- a/kickstart.ks +++ b/kickstart.ks @@ -1,10 +1,13 @@ # Basic setup text +lang en_US +keyboard de +timezone Europe/Berlin network --device=enp1s0 --bootproto=static --ip=192.168.178.3 --netmask=255.255.255.0 --gateway=192.168.178.1 --nameserver=1192.168.178.8 # Basic partitioning clearpart --all --initlabel --disklabel=gpt --drives=sda reqpart --add-boot -part / --grow --fstype ext4 +part / --grow --fstype btrfs # Here's where we reference the container image to install - notice the kickstart # has no `%packages` section! What's being installed here is a container image.