Skip to content

Commit 4e76fc8

Browse files
committed
chore: update qemu artifact to noble base
Also makes the VM artifact release agnostic.
1 parent 874fe26 commit 4e76fc8

File tree

5 files changed

+3
-19
lines changed

5 files changed

+3
-19
lines changed

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

-9
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,6 @@ jobs:
9898
VERSION=$(cat common-nix.vars.pkr.hcl | sed -e 's/postgres-version = "\(.*\)"/\1/g')
9999
echo "version=$VERSION" >> $GITHUB_OUTPUT
100100
101-
# - name: Create nix flake revision tarball
102-
# run: |
103-
# GIT_SHA=${{github.sha}}
104-
# MAJOR_VERSION=${{ env.POSTGRES_MAJOR_VERSION }}
105-
106-
# mkdir -p "/tmp/pg_upgrade_bin/${MAJOR_VERSION}"
107-
# echo "$GIT_SHA" >> "/tmp/pg_upgrade_bin/${MAJOR_VERSION}/nix_flake_version"
108-
# tar -czf "/tmp/pg_binaries.tar.gz" -C "/tmp/pg_upgrade_bin" .
109-
110101
- name: configure aws credentials - staging
111102
uses: aws-actions/configure-aws-credentials@v4
112103
with:

Dockerfile-kubernetes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine:3.21
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 nftables cloud-utils-localds aavmf virtiofsd
66
# dev stuff

Makefile

-4
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

+2-2
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

-3
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 \
@@ -43,7 +41,6 @@ elif [ -n "$(command -v apt-get)" ]; then
4341
add-apt-repository --yes --remove ppa:ansible/ansible
4442

4543
source /etc/os-release
46-
apt-get -y remove --purge linux-headers-5.11.0-1021-aws
4744

4845
apt-get -y update
4946
apt-get -y upgrade

0 commit comments

Comments
 (0)