Skip to content

Commit 7b5f00d

Browse files
committed
fix: retain cloud-init
1 parent ff852d5 commit 7b5f00d

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

Dockerfile-kubernetes

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@ FROM alpine:3.22
22

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

5-
RUN apk add --no-cache qemu-system-aarch64 qemu-img openssh-client aavmf virtiofsd
6-
# dev stuff
7-
# RUN apk add --no-cache iproute2
8-
9-
RUN truncate -s 64M /root/varstore.img
10-
RUN truncate -s 64M /root/efi.img
11-
RUN dd if=/usr/share/AAVMF/QEMU_EFI.fd of=/root/efi.img conv=notrunc
12-
13-
RUN qemu-img create -f qcow2 /tmp/disk.qcow2 -b /disk/focal.qcow2 -F qcow2
14-
15-
RUN apk del aavmf
5+
RUN apk add --no-cache qemu-system-aarch64 qemu-img openssh-client aavmf virtiofsd \
6+
&& truncate -s 64M /root/varstore.img \
7+
&& truncate -s 64M /root/efi.img \
8+
&& dd if=/usr/share/AAVMF/QEMU_EFI.fd of=/root/efi.img conv=notrunc \
9+
&& qemu-img create -f qcow2 /tmp/disk.qcow2 -b /disk/focal.qcow2 -F qcow2 \
10+
&& apk del --no-cache aavmf qemu-img
1611

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

ansible/vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ postgres_major:
1010
# Full version strings for each major version
1111
postgres_release:
1212
postgresorioledb-17: "17.0.1.094-orioledb"
13-
postgres17: "17.4.1.044-darora.1"
13+
postgres17: "17.4.1.044-darora.2"
1414
postgres15: "15.8.1.101"
1515

1616
# Non Postgres Extensions

scripts/90-cleanup-qemu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ elif [ -n "$(command -v apt-get)" ]; then
4444

4545
source /etc/os-release
4646

47-
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
47+
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 screen strace thin-provisioning-tools tmux usb-modeswitch vim vim-runtime wget whiptail xfsprogs
4848
apt remove -y --purge libc6-dev linux-libc-dev libevent-dev libpcre3-dev libsystemd-dev
4949

5050
apt-get -y update

0 commit comments

Comments
 (0)