Skip to content

Commit 8738e54

Browse files
committed
Revert "chore: REVERT this for testing"
This reverts commit 9234a92.
1 parent 9234a92 commit 8738e54

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,18 @@ jobs:
7676
echo "" >> common-nix.vars.pkr.hcl
7777
7878
# TODO (darora): not quite sure why I'm having to uninstall and re-install these deps, but the build fails w/o this
79+
- name: Install dependencies
80+
run: |
81+
sudo apt-get update
82+
sudo apt-get remove -y qemu-efi-aarch64 cloud-image-utils qemu-system-arm qemu-utils
83+
sudo apt-get install -y qemu-efi-aarch64 cloud-image-utils qemu-system-arm qemu-utils
7984
8085
- name: Build QEMU artifact
8186
run: |
82-
mkdir output-cloudimg
83-
touch output-cloudimg/packer-cloudimg
87+
make init
88+
GIT_SHA=${{github.sha}}
89+
export PACKER_LOG=1
90+
packer build -var "git_sha=${GIT_SHA}" -var-file="common-nix.vars.pkr.hcl" qemu-arm64-nix.pkr.hcl
8491
8592
- name: Grab release version
8693
id: process_release_version

Dockerfile-kubernetes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine:3.21
22

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

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

0 commit comments

Comments
 (0)