Skip to content

Commit 1712a57

Browse files
committed
chore: silent remove
1 parent 0d3c7e0 commit 1712a57

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

.github/workflows/qemu-image-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- 'qemu-arm64-nix.pkr.hcl'
1212
- 'common-nix.vars.pkr.hcl'
1313
- 'ansible/vars.yml'
14+
- 'scripts/*'
1415
workflow_dispatch:
1516

1617
permissions:

Dockerfile-kubernetes

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@ FROM alpine:3.22
22

33
ADD ./output-cloudimg/packer-cloudimg /disk/focal.qcow2
44

5-
RUN apk add --no-cache qemu-system-aarch64 openssh-client aavmf virtiofsd
5+
RUN apk add --no-cache qemu-system-aarch64 qemu-img openssh-client aavmf virtiofsd
66
# dev stuff
77
# RUN apk add --no-cache iproute2
88

99
RUN truncate -s 64M /root/varstore.img
1010
RUN truncate -s 64M /root/efi.img
1111
RUN dd if=/usr/share/AAVMF/QEMU_EFI.fd of=/root/efi.img conv=notrunc
1212

13+
RUN qemu-img create -f /tmp/disk.qcow2 -b /disk/focal.qcow2 -F qcow2
14+
1315
RUN apk del aavmf
1416

1517
CMD exec /bin/sh -c "trap : TERM INT; sleep 9999999999d & wait"

ebssurrogate/scripts/qemu-bootstrap-nix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,6 @@ execute_stage2_playbook
155155
# we do not want to ship an initialized DB as this is performed as needed
156156
mkdir -p /db/template
157157
mv /data/pgdata /db/template
158+
cloud-init clean --logs
158159
clean_legacy_things
159160
clean_system
160-
cloud-init clean --logs

scripts/90-cleanup-qemu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ elif [ -n "$(command -v apt-get)" ]; then
4545
source /etc/os-release
4646

4747
apt-get -y remove --purge ansible-core apport appstream bash-completion bcache-tools bind9-dnsutils bind9-host bind9-libs bolt btrfs-progs byobu command-not-found console-setup distro-info eject fonts-ubuntu-console friendly-recovery ftp fwupd gawk gdisk keyboard-configuration libvolume-key1 libicu66 libssl-dev lvm2 lxd-agent-loader man-db mdadm modemmanager mtd-utils nano netcat-openbsd nfs-common ntfs-3g parted pastebinit python3-setuptools python3-twisted screen strace thin-provisioning-tools tmux usb-modeswitch vim vim-runtime wget whiptail xfsprogs
48-
apt remove --purge libc6-dev linux-libc-dev libevent-dev libpcre3-dev libsystemd-dev
48+
apt remove -y --purge libc6-dev linux-libc-dev libevent-dev libpcre3-dev libsystemd-dev
4949

5050
apt-get -y update
5151
apt-get -y upgrade

0 commit comments

Comments
 (0)