Skip to content

Commit 55d5540

Browse files
committed
runvm-osbuild: rework podman images hack
Narrowing in further on why this is required leads to an issue with permissions when supermin is creating the filesystem for the supermin VM. Opened containers/common#2507 upstream to address this, but for now let's fixup the permissions in our image build.
1 parent bf6d7da commit 55d5540

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

build.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,10 @@ configure_user(){
178178
echo -e "builder:1:999\nbuilder:1001:64535" > /etc/subuid
179179
echo -e "builder:1:999\nbuilder:1001:64535" > /etc/subgid
180180

181+
# Allow a few directories to be accessed by unprivileged users.
182+
# Remove when https://github.com/containers/common/pull/2507 has merged
183+
chmod 755 /usr/lib/containers/storage/overlay-images
184+
chmod 755 /usr/lib/containers/storage/overlay-layers
181185
}
182186

183187
write_archive_info() {

src/runvm-osbuild

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@ outdir=cache/osbuild/out
9191

9292
processed_json=$(mktemp -t osbuild-XXXX.json)
9393

94-
# Run `podman images` here to initialize a few directories inside the
95-
# supermin VM. Otherwise the org.osbuild.container-deploy stage will
96-
# fail to copy things into containers-storage. This also happens to
97-
# clean up a skopeo error relating to /etc/containers/networks not existing.
98-
podman images > /dev/null
99-
10094
# Run through the preprocessor
10195
# Note: don't quote the size arguements since they are numbers, not strings
10296
set -x; osbuild-mpp \

0 commit comments

Comments
 (0)