Skip to content

Commit f3daae7

Browse files
darorasamrose
authored andcommitted
chore: update qemu artifact to noble base
Also makes the VM artifact release agnostic.
1 parent 079f3f8 commit f3daae7

File tree

4 files changed

+3
-13
lines changed

4 files changed

+3
-13
lines changed

Dockerfile-kubernetes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine:3.22
22

3-
ADD ./output-cloudimg/packer-cloudimg /disk/focal.qcow2
3+
ADD ./output-cloudimg/packer-cloudimg /disk/image.qcow2
44

55
RUN apk add --no-cache qemu-system-aarch64 qemu-img openssh-client aavmf virtiofsd \
66
&& truncate -s 64M /root/varstore.img \

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ init: qemu-arm64-nix.pkr.hcl
77
output-cloudimg/packer-cloudimg: ansible qemu-arm64-nix.pkr.hcl
88
packer build -var "git_sha=$(UPSTREAM_NIX_GIT_SHA)" qemu-arm64-nix.pkr.hcl
99

10-
disk/focal-raw.img: output-cloudimg/packer-cloudimg
11-
mkdir -p disk
12-
sudo qemu-img convert -O raw output-cloudimg/packer-cloudimg disk/focal-raw.img
13-
1410
alpine-image: output-cloudimg/packer-cloudimg
1511
sudo nerdctl build . -t supabase-postgres-test:$(GIT_SHA) -f ./Dockerfile-kubernetes
1612

qemu-arm64-nix.pkr.hcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ source "qemu" "cloudimg" {
7474
format = "qcow2"
7575
headless = true
7676
http_directory = "http"
77-
iso_checksum = "file:https://cloud-images.ubuntu.com/focal/current/SHA256SUMS"
78-
iso_url = "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-arm64.img"
77+
iso_checksum = "file:https://cloud-images.ubuntu.com/noble/current/SHA256SUMS"
78+
iso_url = "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-arm64.img"
7979
memory = 40000
8080
qemu_binary = "qemu-system-aarch64"
8181
qemuargs = [

scripts/90-cleanup-qemu.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@ elif [ -n "$(command -v apt-get)" ]; then
2424
autoconf \
2525
autotools-dev \
2626
cmake-data \
27-
cpp-8 \
2827
cpp-9 \
2928
cpp-10 \
30-
gcc-8 \
3129
gcc-9 \
3230
gcc-10 \
3331
git \
@@ -44,10 +42,6 @@ elif [ -n "$(command -v apt-get)" ]; then
4442

4543
source /etc/os-release
4644

47-
apt-mark manual libevent-2.1-7 # required for pgbouncer
48-
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
49-
apt remove -y --purge libc6-dev linux-libc-dev libevent-dev libpcre3-dev libsystemd-dev
50-
5145
apt-get -y update
5246
apt-get -y upgrade
5347
apt-get -y autoremove

0 commit comments

Comments
 (0)