Skip to content
This repository was archived by the owner on Jul 15, 2025. It is now read-only.

Commit 163c3f1

Browse files
committed
update runner image, use run-parts
1 parent fb590c6 commit 163c3f1

File tree

8 files changed

+10
-13
lines changed

8 files changed

+10
-13
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

make-image

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,13 @@ apt-get update
4747
curl https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/master/alpine-chroot-install | sh
4848

4949
cp -R bootstrap/ /alpine/
50-
51-
/alpine/enter-chroot /bootstrap/kernel.sh
52-
/alpine/enter-chroot /bootstrap/system.sh
53-
/alpine/enter-chroot /bootstrap/users.sh
54-
/alpine/enter-chroot /bootstrap/networking.sh
55-
/alpine/enter-chroot /bootstrap/services.sh
56-
/alpine/enter-chroot /bootstrap/first-boot.sh
50+
/alpine/enter-chroot run-parts /bootstrap/
5751

5852
rm -rf /alpine/var/lib/apt/lists/*
5953
rm -rf /alpine/var/cache/apk/*
6054
rm -rf /alpine/root/*
6155
rm -rf /alpine/bootstrap/
62-
rm /alpine/enter-chroot
63-
rm /alpine/etc/resolv.conf
64-
rm /alpine/env.sh
56+
rm /alpine/env.sh /alpine/etc/resolv.conf /alpine/enter-chroot /alpine/destroy
6557
find /alpine -iname "*-" -delete
6658
find /alpine -iname "*~" -delete
6759

@@ -78,7 +70,12 @@ resize2fs -p "$ROOT_DEV" $ROOT_MIN_SIZE
7870

7971
# shrink partition
8072
PART_END=$(($ROOT_PART_START + ($ROOT_MIN_SIZE * $ROOT_BLOCK_SIZE)))
81-
parted ---pretend-input-tty "$OUTPUT_IMG" unit B resizepart 2 $PART_END yes
73+
parted ---pretend-input-tty "$OUTPUT_IMG" <<EOF
74+
unit B
75+
resizepart 2 $PART_END
76+
yes
77+
quit
78+
EOF
8279

8380
losetup -d "$LOOP_DEV"
8481

runner/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM ubuntu:bionic
2-
RUN apt-get update && apt-get install -y e2fsprogs dosfstools xxd parted udev wget curl qemu-user-static binfmt-support subversion zerofree
1+
FROM ubuntu:hirsute
2+
RUN apt-get update && apt-get install -y e2fsprogs dosfstools xxd parted udev wget curl qemu-user-static binfmt-support zerofree fdisk

0 commit comments

Comments
 (0)