less buildah, use fedora as base

This commit is contained in:
Julian Wefers
2026-05-30 22:30:10 +02:00
parent e3eae265f7
commit 8a96decfdc
3 changed files with 9 additions and 4 deletions
+3 -1
View File
@@ -1,4 +1,4 @@
FROM quay.io/fedora/fedora-coreos:stable FROM quay.io/fedora/fedora-bootc:44
# Install ZFS # Install ZFS
RUN dnf install -y kernel-devel-$(uname -r | awk -F'-' '{print $1}') 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=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 COPY --chown=backup:backup --chmod=600 id_ed25519.pub /var/home/backup/.ssh/authorized_keys
RUN bootc container lint
+2 -2
View File
@@ -2,18 +2,18 @@ REPO="gitea.wefers.page/julian/backup-server"
TAG="latest" TAG="latest"
build() { build() {
# ABSOLUTELY DO NOT USE --squash, as ostree NEEDS the layers
buildah build \ buildah build \
-t ${REPO}:${TAG} \ -t ${REPO}:${TAG} \
--pull \ --pull \
--layers \ --layers \
--squash \
--format oci \ --format oci \
. .
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
buildah login gitea.wefers.page -u julian -p 278b81490079574229dce45b66b726d2ae7e83c0 buildah login gitea.wefers.page -u julian -p 278b81490079574229dce45b66b726d2ae7e83c0
buildah push \ buildah push \
--compression-format zstd:chunked \ --compression-format zstd \
"${REPO}:${TAG}" "${REPO}:${TAG}"
fi fi
+4 -1
View File
@@ -1,10 +1,13 @@
# Basic setup # Basic setup
text 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 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 # Basic partitioning
clearpart --all --initlabel --disklabel=gpt --drives=sda clearpart --all --initlabel --disklabel=gpt --drives=sda
reqpart --add-boot reqpart --add-boot
part / --grow --fstype ext4 part / --grow --fstype btrfs
# Here's where we reference the container image to install - notice the kickstart # 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. # has no `%packages` section! What's being installed here is a container image.