From f2300bfb28004a4b3370ef811d17e184346a3c43 Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Sun, 18 May 2025 16:30:39 +0200 Subject: [PATCH] Setup shared image stores --- .forgejo/workflows/build.yaml | 6 ++++++ builder.sh | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 28f1f59..104e8d5 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -20,10 +20,16 @@ jobs: git \ netavark \ ; + shared=/var/lib/shared-containers sed /usr/share/containers/storage.conf \ -e '/^#\?mount_program/c\ mount_program = "/usr/bin/fuse-overlayfs"' \ + -e "/^additionalimagestores/a"'\ + '"\"$shared\"" \ > /etc/containers/storage.conf + mkdir -p $shared/overlay-images $shared/overlay-layers + touch $shared/overlay-images/images.lock + touch $shared/overlay-layers/layers.lock - name: Checkout repository run: | diff --git a/builder.sh b/builder.sh index 4055ce0..f2123b8 100755 --- a/builder.sh +++ b/builder.sh @@ -24,11 +24,20 @@ buildah run $ctr -- apt-get install -y --no-install-recommends \ ; #gpg \ +shared=/var/lib/shared-containers buildah run $ctr -- sh -c "sed /usr/share/containers/storage.conf \ -e '/^#\?mount_program/c"'\ '"mount_program = \"/usr/bin/fuse-overlayfs\"' \ + -e '/^additionalimagestores/a"'\ +'" \"$shared\"' \ > /etc/containers/storage.conf" +buildah run $ctr -- sc -c "\ + mkdir -p $shared/overlay-images $shared/overlay-layers; \ + touch $shared/overlay-images/images.lock; \ + touch $shared/overlay-layers/layers.lock; \ +" + # yq https://github.com/mikefarah/yq?tab=readme-ov-file#install buildah run $ctr -- sh -c "curl --silent --location \"https://github.com/mikefarah/yq/releases/download/$YQ_VERSION/yq_linux_amd64.tar.gz\" \ | tar --extract --gzip --to-stdout ./yq_linux_amd64 \